From 525db87185d68e722c32658f0bf045bae927ead5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Lepage=20Vall=C3=A9e?= Date: Sun, 25 Aug 2024 18:23:14 +0200 Subject: [PATCH 01/10] Move the C coverage to the CodeCov GitHub Action Same as Last PR. Now I expect the Lua coverage to work and the C coverage. I did it in 2 PRs to make sure the delta works. I also added a `-j8` in the example test step because it is I/O bound and it has enough ram. This should speed-up the CI (maybe?). --- .github/workflows/main.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c04d069875..ee944b2c19 100644 --- 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 -j8 - name: Run requires tests if: matrix.coverage @@ -330,7 +326,7 @@ jobs: 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 +345,13 @@ 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 C code coverage report + if: matrix.coverage == 'codecov' + uses: codecov/codecov-action@v3 + with: + files: "${{ github.workspace }}/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 From 42d09806b5290afc42ca4bfe62a087f83c2b2f9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Lepage=20Vall=C3=A9e?= Date: Sun, 25 Aug 2024 18:33:54 +0200 Subject: [PATCH 02/10] Update main.yml --- .github/workflows/main.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ee944b2c19..ae3d8dcfce 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -304,7 +304,7 @@ jobs: run: cd "${{ github.workspace }}/build" && make check-unit - name: Run examples tests - run: cd "${{ github.workspace }}/build" && make check-examples -j8 + run: cd "${{ github.workspace }}/build" && make check-examples -j16 - name: Run requires tests if: matrix.coverage @@ -318,14 +318,6 @@ 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: Generate C coverage report if: matrix.coverage == 'codecov' run: | @@ -345,11 +337,20 @@ jobs: # with Code Climate. find "gcov.$i" -maxdepth 1 -type f -name '#usr#*.gcov' -delete done + - name: Upload C code coverage report if: matrix.coverage == 'codecov' uses: codecov/codecov-action@v3 with: - files: "${{ github.workspace }}/gcov" + files: "${{ github.workspace }}/build/*.gcov" + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + + - 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 }} From 774fa0ad2e3a5ec9e315a06d34ea1f0ad1341dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Lepage=20Vall=C3=A9e?= Date: Sun, 25 Aug 2024 18:40:00 +0200 Subject: [PATCH 03/10] Update main.yml --- .github/workflows/main.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ae3d8dcfce..f989cf537c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -337,16 +337,8 @@ jobs: # with Code Climate. find "gcov.$i" -maxdepth 1 -type f -name '#usr#*.gcov' -delete done - - - 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 }} - - name: Upload Lua code coverage report + - name: Upload code coverage report if: matrix.coverage == 'codecov' uses: codecov/codecov-action@v3 with: From 4a09c2c85ff396ab0751044ac35f89e4bb4b795d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Lepage=20Vall=C3=A9e?= Date: Tue, 27 Aug 2024 12:00:04 +0200 Subject: [PATCH 04/10] Update main.yml --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f989cf537c..8f6f797f96 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -304,7 +304,7 @@ jobs: run: cd "${{ github.workspace }}/build" && make check-unit - name: Run examples tests - run: cd "${{ github.workspace }}/build" && make check-examples -j16 + run: cd "${{ github.workspace }}/build" && make check-examples -j24 - name: Run requires tests if: matrix.coverage @@ -337,6 +337,7 @@ jobs: # with Code Climate. find "gcov.$i" -maxdepth 1 -type f -name '#usr#*.gcov' -delete done + find .. -iname '*gcov*' 2> /dev/null || true - name: Upload code coverage report if: matrix.coverage == 'codecov' From 59005ca3f749a2a37ededf5e5ec0ccddcac5596a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Lepage=20Vall=C3=A9e?= Date: Tue, 27 Aug 2024 12:12:41 +0200 Subject: [PATCH 05/10] Update main.yml --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8f6f797f96..27a18e159a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -337,7 +337,9 @@ jobs: # with Code Climate. find "gcov.$i" -maxdepth 1 -type f -name '#usr#*.gcov' -delete done - find .. -iname '*gcov*' 2> /dev/null || true + echo "All gcov files:" + find / -iname '*gcov*' 2> /dev/null || true + echo "PWD ${PWD}" - name: Upload code coverage report if: matrix.coverage == 'codecov' From 8ef35f56a3b1be0b01ce062e55aeab38f4a2a90b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Lepage=20Vall=C3=A9e?= Date: Tue, 27 Aug 2024 12:26:42 +0200 Subject: [PATCH 06/10] Update main.yml --- .github/workflows/main.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 27a18e159a..4e4a9fbcaf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -337,17 +337,22 @@ jobs: # with Code Climate. find "gcov.$i" -maxdepth 1 -type f -name '#usr#*.gcov' -delete done - echo "All gcov files:" - find / -iname '*gcov*' 2> /dev/null || true - echo "PWD ${PWD}" - - name: Upload code coverage report + - 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 From 797e093bcdd4f4cd8b46018805078f1108440147 Mon Sep 17 00:00:00 2001 From: elig0n <31196036+elig0n@users.noreply.github.com> Date: Mon, 14 Oct 2024 07:53:29 +0300 Subject: [PATCH 07/10] doc: fix typo in struts.lua (#3964) --- tests/examples/screen/struts.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/examples/screen/struts.lua b/tests/examples/screen/struts.lua index 42498661bb..92b5f52bbf 100644 --- 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 From e12ed2529b73259c97f895c6b126ca978f988e4b Mon Sep 17 00:00:00 2001 From: elig0n <31196036+elig0n@users.noreply.github.com> Date: Mon, 14 Oct 2024 07:54:08 +0300 Subject: [PATCH 08/10] fix typo in urgency.lua (#3965) --- tests/examples/wibox/nwidget/rules/urgency.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/examples/wibox/nwidget/rules/urgency.lua b/tests/examples/wibox/nwidget/rules/urgency.lua index 45aeb48eb4..727de4ae57 100644 --- 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", From 206e6e1cbf54d887ce60fc36ff9f6acfb8b2e213 Mon Sep 17 00:00:00 2001 From: elig0n <31196036+elig0n@users.noreply.github.com> Date: Mon, 14 Oct 2024 14:04:04 +0300 Subject: [PATCH 09/10] doc: fix typos in taglist.lua (#3966) --- lib/awful/widget/taglist.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/awful/widget/taglist.lua b/lib/awful/widget/taglist.lua index 8dd773057b..e5e41663f0 100644 --- 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. -- From 06901a91902324675b35df0ec0d009099349910b Mon Sep 17 00:00:00 2001 From: elig0n Date: Tue, 15 Oct 2024 10:09:47 +0300 Subject: [PATCH 10/10] fix missing DOC_HIDE --- tests/examples/wibox/nwidget/rules/widget_template.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/examples/wibox/nwidget/rules/widget_template.lua b/tests/examples/wibox/nwidget/rules/widget_template.lua index d2d00d1f53..fa22be31fe 100644 --- 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