Merge branch 'awesomeWM:master' into patch-3

awesomeWM · Oct 27, 2024 · 896837e · 896837e
2 parents d51e9bd + 2b7006f
commit 896837e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 22 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -240,10 +240,6 @@ jobs:
         if: matrix.coverage
         run: sudo -H luarocks install cluacov
 
-      - name: Install codecov.io uploader
-        if: matrix.coverage == 'codecov'
-        run: wget -O /tmp/codecov-bash https://codecov.io/bash
-
       # Check out repository to ${{ github.workspace }}
       # Automatically picks the current branch/PR
       - uses: actions/checkout@v2
@@ -308,7 +304,7 @@ jobs:
         run: cd "${{ github.workspace }}/build" && make check-unit
 
       - name: Run examples tests
-        run: cd "${{ github.workspace }}/build" && make check-examples
+        run: cd "${{ github.workspace }}/build" && make check-examples -j24
 
       - name: Run requires tests
         if: matrix.coverage
@@ -322,15 +318,7 @@ jobs:
         run: |
           luacov
 
-      - name: Upload Lua code coverage report
-        if: matrix.coverage == 'codecov'
-        uses: codecov/codecov-action@v3
-        with:
-          files: "${{ github.workspace }}/build/luacov.report.out"
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-
-      - name: Upload C code coverage report
+      - name: Generate C coverage report
         if: matrix.coverage == 'codecov'
         run: |
           # Report coverage for each .gcno file separately.
@@ -349,9 +337,22 @@ jobs:
             # with Code Climate.
             find "gcov.$i" -maxdepth 1 -type f -name '#usr#*.gcov' -delete
           done
-
-          # Upload to Codecov.
-          bash /tmp/codecov-bash -X gcov -X coveragepy -F gcov
+          
+      - name: Upload Lua code coverage report
+        if: matrix.coverage == 'codecov'
+        uses: codecov/codecov-action@v3
+        with:
+          files: "${{ github.workspace }}/build/luacov.report.out"
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: Upload C code coverage report
+        if: matrix.coverage == 'codecov'
+        uses: codecov/codecov-action@v3
+        with:
+          files: "${{ github.workspace }}/build/*/*.gcov"
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
       # `check-qa` is the only test that doesn't get a coverage report, so it has to run after all of that.
       - name: Run qa tests

diff --git a/lib/awful/widget/taglist.lua b/lib/awful/widget/taglist.lua
@@ -1,7 +1,7 @@
 ---------------------------------------------------------------------------
 --- Taglist widget module for awful.
 --
--- Here is a more advanced example of how to extent the `taglist`. It provides:
+-- Here is a more advanced example of how to extend the `taglist`. It provides:
 --
 -- * mouse "hover" color
 -- * an extra index field
@@ -431,7 +431,7 @@ end
 
 --- The current number of tags.
 --
--- Note that the `tasklist` is usually lazy-loaded. Reading this property
+-- Note that the `taglist` is usually lazy-loaded. Reading this property
 -- may cause the widgets to be created. Depending on where the property is called
 -- from, it might, in theory, cause an infinite loop.
 --

diff --git a/tests/examples/screen/struts.lua b/tests/examples/screen/struts.lua
@@ -11,7 +11,7 @@ local awful = { --DOC_HIDE
     -- Wibars and docked clients are the main users of the struts.
     local wibar = awful.wibar {
         position = "top",
-        height   = 24, -- this will set the wibar won :struts() to top=24
+        height   = 24, -- this will set the wibar own :struts() to top=24
     }
 
 awful.tag.add("1", { --DOC_HIDE

diff --git a/tests/examples/wibox/nwidget/rules/urgency.lua b/tests/examples/wibox/nwidget/rules/urgency.lua
@@ -40,7 +40,7 @@ local notif =  --DOC_HIDE
 
 --DOC_NEWLINE
 
-   -- Create a normal notification.
+   -- Create a critical notification.
 local notif2 =  --DOC_HIDE
    naughty.notification {
        title   = "A notification 2",

diff --git a/tests/examples/wibox/nwidget/rules/widget_template.lua b/tests/examples/wibox/nwidget/rules/widget_template.lua
@@ -78,7 +78,7 @@ local notif2 =  --DOC_HIDE
    naughty.notification {  --DOC_HIDE
        title     = "Daft Punk",  --DOC_HIDE
        message   = "Harder, Better, Faster, Stronger",  --DOC_HIDE
-       icon      = beautiful.awesome_icon,
+       icon      = beautiful.awesome_icon, --DOC_HIDE
        icon_size = 128,  --DOC_HIDE
        app_name  = "mdp",  --DOC_HIDE
    }  --DOC_HIDE