From 6b9ba2af17d77adb37e55252e98ac9876b2820e7 Mon Sep 17 00:00:00 2001 From: CoolCat467 <52022020+CoolCat467@users.noreply.github.com> Date: Sun, 11 Feb 2024 17:09:10 -0600 Subject: [PATCH 01/12] Update to `codecov-action@v4` --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fabc57b9c2..68f2adab4a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,7 +80,7 @@ jobs: LSP: '${{ matrix.lsp }}' LSP_EXTRACT_FILE: '${{ matrix.lsp_extract_file }}' - if: always() - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 @@ -136,7 +136,7 @@ jobs: CHECK_FORMATTING: '${{ matrix.check_formatting }}' NO_TEST_REQUIREMENTS: '${{ matrix.no_test_requirements }}' - if: always() - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 @@ -172,7 +172,7 @@ jobs: - name: Run tests run: ./ci.sh - if: always() - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 @@ -197,7 +197,7 @@ jobs: - name: Run tests run: source .venv/bin/activate && ./ci.sh - if: always() - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 From 4ab573e24449bbafa4b19a7f38dd28b4d2d8b3ca Mon Sep 17 00:00:00 2001 From: CoolCat467 <52022020+CoolCat467@users.noreply.github.com> Date: Mon, 12 Feb 2024 20:01:51 -0600 Subject: [PATCH 02/12] Revert to v3 and add note for alpine container --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68f2adab4a..0e372d6be8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -197,7 +197,8 @@ jobs: - name: Run tests run: source .venv/bin/activate && ./ci.sh - if: always() - uses: codecov/codecov-action@v4 + # Can't update to v4 quite yet, see https://github.com/codecov/codecov-action/issues/1279 + uses: codecov/codecov-action@v3 with: directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 From 25f467bd152e5ffbf235564a5738fde9136885db Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Tue, 13 Feb 2024 02:01:01 -0500 Subject: [PATCH 03/12] Don't let codecov search for coverage files --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0d0f73b08..820b0d41c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,7 +82,7 @@ jobs: - if: always() uses: codecov/codecov-action@v4 with: - directory: empty + file: empty/coverage.xml token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Windows (${{ matrix.python }}, ${{ matrix.arch }}${{ matrix.extra_name }}) flags: Windows,${{ matrix.python }} @@ -138,7 +138,7 @@ jobs: - if: always() uses: codecov/codecov-action@v4 with: - directory: empty + file: empty/coverage.xml token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Ubuntu (${{ matrix.python }}${{ matrix.extra_name }}) flags: Ubuntu,${{ matrix.python }} @@ -174,7 +174,7 @@ jobs: - if: always() uses: codecov/codecov-action@v4 with: - directory: empty + file: empty/coverage.xml token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: macOS (${{ matrix.python }}) flags: macOS,${{ matrix.python }} @@ -200,7 +200,7 @@ jobs: # Can't update to v4 quite yet, see https://github.com/codecov/codecov-action/issues/1279 uses: codecov/codecov-action@v3 with: - directory: empty + file: empty/coverage.xml token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Alpine flags: Alpine,3.12 From 95dd3fc3a911484644a82e59253a828856ebe10a Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Tue, 13 Feb 2024 02:05:05 -0500 Subject: [PATCH 04/12] Revert attempt to work around codecov --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 820b0d41c3..a0d0f73b08 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,7 +82,7 @@ jobs: - if: always() uses: codecov/codecov-action@v4 with: - file: empty/coverage.xml + directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Windows (${{ matrix.python }}, ${{ matrix.arch }}${{ matrix.extra_name }}) flags: Windows,${{ matrix.python }} @@ -138,7 +138,7 @@ jobs: - if: always() uses: codecov/codecov-action@v4 with: - file: empty/coverage.xml + directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Ubuntu (${{ matrix.python }}${{ matrix.extra_name }}) flags: Ubuntu,${{ matrix.python }} @@ -174,7 +174,7 @@ jobs: - if: always() uses: codecov/codecov-action@v4 with: - file: empty/coverage.xml + directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: macOS (${{ matrix.python }}) flags: macOS,${{ matrix.python }} @@ -200,7 +200,7 @@ jobs: # Can't update to v4 quite yet, see https://github.com/codecov/codecov-action/issues/1279 uses: codecov/codecov-action@v3 with: - file: empty/coverage.xml + directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Alpine flags: Alpine,3.12 From 73b7482ca780e92c59ef624310b8af5df65d0eb6 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Tue, 13 Feb 2024 02:21:02 -0500 Subject: [PATCH 05/12] Try one more workaround --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0d0f73b08..3e2327974e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,7 +82,7 @@ jobs: - if: always() uses: codecov/codecov-action@v4 with: - directory: empty + working-directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Windows (${{ matrix.python }}, ${{ matrix.arch }}${{ matrix.extra_name }}) flags: Windows,${{ matrix.python }} @@ -138,7 +138,7 @@ jobs: - if: always() uses: codecov/codecov-action@v4 with: - directory: empty + working-directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Ubuntu (${{ matrix.python }}${{ matrix.extra_name }}) flags: Ubuntu,${{ matrix.python }} @@ -200,7 +200,7 @@ jobs: # Can't update to v4 quite yet, see https://github.com/codecov/codecov-action/issues/1279 uses: codecov/codecov-action@v3 with: - directory: empty + working-directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Alpine flags: Alpine,3.12 From 247415212b04dc7e88223f4631fefaa63e7223c5 Mon Sep 17 00:00:00 2001 From: jakkdl Date: Wed, 13 Mar 2024 15:30:04 +0100 Subject: [PATCH 06/12] move coverage.xml to root dir and don't specify directory --- .github/workflows/ci.yml | 4 ---- ci.sh | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 570a5ae257..017560b614 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,6 @@ jobs: - if: always() uses: codecov/codecov-action@v4 with: - working-directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Windows (${{ matrix.python }}, ${{ matrix.arch }}${{ matrix.extra_name }}) flags: Windows,${{ matrix.python }} @@ -131,7 +130,6 @@ jobs: - if: always() uses: codecov/codecov-action@v4 with: - working-directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Ubuntu (${{ matrix.python }}${{ matrix.extra_name }}) flags: Ubuntu,${{ matrix.python }} @@ -167,7 +165,6 @@ jobs: - if: always() uses: codecov/codecov-action@v4 with: - directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: macOS (${{ matrix.python }}) flags: macOS,${{ matrix.python }} @@ -193,7 +190,6 @@ jobs: # Can't update to v4 quite yet, see https://github.com/codecov/codecov-action/issues/1279 uses: codecov/codecov-action@v3 with: - working-directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Alpine flags: Alpine,3.12 diff --git a/ci.sh b/ci.sh index 112ed04d7a..e368b75d0f 100755 --- a/ci.sh +++ b/ci.sh @@ -139,6 +139,7 @@ else coverage combine --rcfile ../pyproject.toml coverage report -m --rcfile ../pyproject.toml coverage xml --rcfile ../pyproject.toml + mv coverage.xml .. # Remove the LSP again; again we want to do this ASAP to avoid # accidentally breaking other stuff. From c806b2056d6c39ee3399eadccb757874ca593f9f Mon Sep 17 00:00:00 2001 From: jakkdl Date: Wed, 13 Mar 2024 15:47:03 +0100 Subject: [PATCH 07/12] Revert "move coverage.xml to root dir and don't specify directory" that made no difference to anything This reverts commit 247415212b04dc7e88223f4631fefaa63e7223c5. --- .github/workflows/ci.yml | 4 ++++ ci.sh | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 017560b614..570a5ae257 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,6 +75,7 @@ jobs: - if: always() uses: codecov/codecov-action@v4 with: + working-directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Windows (${{ matrix.python }}, ${{ matrix.arch }}${{ matrix.extra_name }}) flags: Windows,${{ matrix.python }} @@ -130,6 +131,7 @@ jobs: - if: always() uses: codecov/codecov-action@v4 with: + working-directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Ubuntu (${{ matrix.python }}${{ matrix.extra_name }}) flags: Ubuntu,${{ matrix.python }} @@ -165,6 +167,7 @@ jobs: - if: always() uses: codecov/codecov-action@v4 with: + directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: macOS (${{ matrix.python }}) flags: macOS,${{ matrix.python }} @@ -190,6 +193,7 @@ jobs: # Can't update to v4 quite yet, see https://github.com/codecov/codecov-action/issues/1279 uses: codecov/codecov-action@v3 with: + working-directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Alpine flags: Alpine,3.12 diff --git a/ci.sh b/ci.sh index e368b75d0f..112ed04d7a 100755 --- a/ci.sh +++ b/ci.sh @@ -139,7 +139,6 @@ else coverage combine --rcfile ../pyproject.toml coverage report -m --rcfile ../pyproject.toml coverage xml --rcfile ../pyproject.toml - mv coverage.xml .. # Remove the LSP again; again we want to do this ASAP to avoid # accidentally breaking other stuff. From 387bdbab4654f27650caa07f79b79a8072bcb88e Mon Sep 17 00:00:00 2001 From: CoolCat467 <52022020+CoolCat467@users.noreply.github.com> Date: Wed, 13 Mar 2024 13:39:37 -0500 Subject: [PATCH 08/12] Add `verbose: true` to codecov action settings --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 570a5ae257..b462da925e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,6 +79,7 @@ jobs: token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Windows (${{ matrix.python }}, ${{ matrix.arch }}${{ matrix.extra_name }}) flags: Windows,${{ matrix.python }} + verbose: true Ubuntu: name: 'Ubuntu (${{ matrix.python }}${{ matrix.extra_name }})' @@ -135,6 +136,7 @@ jobs: token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Ubuntu (${{ matrix.python }}${{ matrix.extra_name }}) flags: Ubuntu,${{ matrix.python }} + verbose: true macOS: name: 'macOS (${{ matrix.python }})' @@ -171,6 +173,7 @@ jobs: token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: macOS (${{ matrix.python }}) flags: macOS,${{ matrix.python }} + verbose: true # run CI on a musl linux Alpine: @@ -197,6 +200,7 @@ jobs: token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Alpine flags: Alpine,3.12 + verbose: true Cython: name: "Cython" From bb7b36b0d5834655a9d2b25d9d549fb78331043f Mon Sep 17 00:00:00 2001 From: CoolCat467 <52022020+CoolCat467@users.noreply.github.com> Date: Mon, 22 Apr 2024 18:18:11 -0500 Subject: [PATCH 09/12] Try re-adding `directory` --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b462da925e..8fbe189abb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,6 +75,7 @@ jobs: - if: always() uses: codecov/codecov-action@v4 with: + directory: empty working-directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Windows (${{ matrix.python }}, ${{ matrix.arch }}${{ matrix.extra_name }}) From 23596dd8eac8c32a6f925669ad8f298936b09ddb Mon Sep 17 00:00:00 2001 From: CoolCat467 <52022020+CoolCat467@users.noreply.github.com> Date: Mon, 22 Apr 2024 18:22:05 -0500 Subject: [PATCH 10/12] Re-add more `directory` tags I missed --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fbe189abb..ba39d19fdc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -133,6 +133,7 @@ jobs: - if: always() uses: codecov/codecov-action@v4 with: + directory: empty working-directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Ubuntu (${{ matrix.python }}${{ matrix.extra_name }}) @@ -171,6 +172,7 @@ jobs: uses: codecov/codecov-action@v4 with: directory: empty + working-directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: macOS (${{ matrix.python }}) flags: macOS,${{ matrix.python }} From 558c7215e2792c64b06064c70867ea8b8c008fd0 Mon Sep 17 00:00:00 2001 From: CoolCat467 <52022020+CoolCat467@users.noreply.github.com> Date: Mon, 22 Apr 2024 18:24:09 -0500 Subject: [PATCH 11/12] More missing `directory` fields --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba39d19fdc..8d9c588592 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -199,7 +199,7 @@ jobs: # Can't update to v4 quite yet, see https://github.com/codecov/codecov-action/issues/1279 uses: codecov/codecov-action@v3 with: - working-directory: empty + directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46 name: Alpine flags: Alpine,3.12 From f910887593ef6b51f8ed46b3a0cc1de8df181c9a Mon Sep 17 00:00:00 2001 From: jakkdl Date: Sat, 31 Aug 2024 15:51:55 +0200 Subject: [PATCH 12/12] make alpine use v4 --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1db2662b4b..297d6d2803 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -196,8 +196,7 @@ jobs: - name: Run tests run: source .venv/bin/activate && ./ci.sh - if: always() - # Can't update to v4 quite yet, see https://github.com/codecov/codecov-action/issues/1279 - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: directory: empty token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46