From 3587a85e4caa26217516b9b778b3462067253b98 Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Thu, 25 Jan 2024 00:30:08 +0100 Subject: [PATCH 1/5] update `actions/upload-artifact` and `actions/download-artifact` from 3 to 4 --- .github/workflows/base_test_workflow.yml | 6 +++--- .github/workflows/test_napari_repo.yml | 4 ++-- .github/workflows/test_prereleases.yml | 8 ++++---- .github/workflows/tests.yml | 11 ++++++----- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/base_test_workflow.yml b/.github/workflows/base_test_workflow.yml index dec303b12..472612edc 100644 --- a/.github/workflows/base_test_workflow.yml +++ b/.github/workflows/base_test_workflow.yml @@ -71,7 +71,7 @@ jobs: - name: Download test data if: ${{ inputs.test_data }} - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: test_data path: test_data @@ -100,9 +100,9 @@ jobs: retention-days: 7 - name: Upload coverage data - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ inputs.coverage }} with: - name: coverage reports + name: cov-reports-${{ inputs.os }}-py-${{ inputs.python_version }}-${{ inputs.napari }}-${{ inputs.qt_backend }} path: | ./.coverage.* diff --git a/.github/workflows/test_napari_repo.yml b/.github/workflows/test_napari_repo.yml index 4607e36fb..1c38781aa 100644 --- a/.github/workflows/test_napari_repo.yml +++ b/.github/workflows/test_napari_repo.yml @@ -15,7 +15,7 @@ jobs: - shell: bash run: bash build_utils/download_data.sh - name: Upload test data - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test_data path: test_data @@ -54,7 +54,7 @@ jobs: pip install setuptools tox tox-gh-actions - name: Download test data - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: test_data path: test_data diff --git a/.github/workflows/test_prereleases.yml b/.github/workflows/test_prereleases.yml index eb8cadfd7..dfbe0b68f 100644 --- a/.github/workflows/test_prereleases.yml +++ b/.github/workflows/test_prereleases.yml @@ -23,7 +23,7 @@ jobs: - shell: bash run: bash build_utils/download_data.sh - name: Upload test data - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test_data path: test_data @@ -59,7 +59,7 @@ jobs: - uses: tlambert03/setup-qt-libs@v1 - name: Download test data - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: test_data path: test_data @@ -115,14 +115,14 @@ jobs: pip-sync pip install . - name: upload requirements - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: requirements path: requirements.txt - name: Run PyInstaller run: python build_utils/create_and_pack_executable.py - name: Upload bundle - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bundle path: dist2/ diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index be7d50d2f..47d81964b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,7 +25,7 @@ jobs: - shell: bash run: bash build_utils/download_data.sh - name: Upload test data - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test_data path: test_data @@ -133,10 +133,11 @@ jobs: pip install codecov - name: Download coverage data - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: coverage reports + pattern: cov-reports-* path: coverage + merge-multiple: true - name: combine coverage data run: | python -Im coverage combine coverage @@ -152,7 +153,7 @@ jobs: retention-days: 5 - name: Upload coverage data - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: fail_ci_if_error: true token: ${{ secrets.CODECOV_TOKEN }} @@ -176,7 +177,7 @@ jobs: - uses: tlambert03/setup-qt-libs@v1 - name: Download test data - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: test_data path: test_data From 736b7747657264adf4d6cc79b841823eb9e2eea9 Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Thu, 25 Jan 2024 00:36:51 +0100 Subject: [PATCH 2/5] bump missed one --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 47d81964b..0f0badeb5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -202,7 +202,7 @@ jobs: run: bash build_utils/create_environment_yml.sh - name: Upload environment file - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: environment path: environment.yml From 38f3fae201db783d6603ebb47e6cf2b06f054e88 Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Thu, 25 Jan 2024 01:26:28 +0100 Subject: [PATCH 3/5] fix configuration --- .github/workflows/base_test_workflow.yml | 4 ++-- .github/workflows/tests.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/base_test_workflow.yml b/.github/workflows/base_test_workflow.yml index 472612edc..92381a9b7 100644 --- a/.github/workflows/base_test_workflow.yml +++ b/.github/workflows/base_test_workflow.yml @@ -92,9 +92,9 @@ jobs: BACKEND: ${{ inputs.qt_backend }} PIP_CONSTRAINT: requirements/constraints_py${{ inputs.python_version }}.txt - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: - name: upload pytest timing reports as json + name: timing-report-${{ inputs.os }}-py-${{ inputs.python_version }}-${{ inputs.napari }}-${{ inputs.qt_backend }} path: | ./report-*.json retention-days: 7 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0f0badeb5..8c8e1304e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -102,8 +102,8 @@ jobs: uses: ./.github/workflows/base_test_workflow.yml with: test_data: True - python_version: "3.8" - tox_args: "-e py38-PyQt5-coverage" + python_version: "3.10" + tox_args: "-e py310-PyQt5-coverage" coverage: true test_minimal: From 8154bb1fe94fe879ae7b09ee4833b283c571b8e7 Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Thu, 25 Jan 2024 08:25:18 +0100 Subject: [PATCH 4/5] add coverage information to name --- .github/workflows/base_test_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/base_test_workflow.yml b/.github/workflows/base_test_workflow.yml index 92381a9b7..a77ab2706 100644 --- a/.github/workflows/base_test_workflow.yml +++ b/.github/workflows/base_test_workflow.yml @@ -94,7 +94,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: timing-report-${{ inputs.os }}-py-${{ inputs.python_version }}-${{ inputs.napari }}-${{ inputs.qt_backend }} + name: timing-report-${{ inputs.os }}-py-${{ inputs.python_version }}-${{ inputs.napari }}-${{ inputs.qt_backend }}-${{ inputs.coverage }} path: | ./report-*.json retention-days: 7 From df2fcb0eb462f82f7a4b89deae0f3c436b5e8281 Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Thu, 25 Jan 2024 09:06:39 +0100 Subject: [PATCH 5/5] fix coverage action --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8c8e1304e..2d0d85b3f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -153,7 +153,7 @@ jobs: retention-days: 5 - name: Upload coverage data - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v3 with: fail_ci_if_error: true token: ${{ secrets.CODECOV_TOKEN }}