From 204f12947f7adb02c6923f49de416fd24e24104c Mon Sep 17 00:00:00 2001 From: naik-aakash Date: Wed, 11 Sep 2024 12:56:11 +0200 Subject: [PATCH 1/5] revert coverage combine --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index b468c2d7..5fbda2a4 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -91,7 +91,7 @@ jobs: - name: Run coverage continue-on-error: true run: | - coverage combine coverage*/.coverage-*-3.10 + coverage combine coverage*/.coverage* coverage report --show-missing - name: Upload coverage reports to Codecov From 138f623e6c3bfe5c43a7b41f344d1cdfd754d67a Mon Sep 17 00:00:00 2001 From: Aakash Ashok Naik <91958822+naik-aakash@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:10:54 +0200 Subject: [PATCH 2/5] Update python-package.yml --- .github/workflows/python-package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 5fbda2a4..75234f5d 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -65,9 +65,9 @@ jobs: - name: Upload coverage uses: actions/upload-artifact@v4 with: - name: coverage-${{ matrix.split }}-${{ matrix.python-version }} + name: coverage-${{ matrix.split }} include-hidden-files: true - overwrite: false + overwrite: true path: ./.coverage coverage: From 0a956c4616d9ed3ac3451d0d0f879e41ccd08600 Mon Sep 17 00:00:00 2001 From: Aakash Ashok Naik <91958822+naik-aakash@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:24:13 +0200 Subject: [PATCH 3/5] Update python-package.yml --- .github/workflows/python-package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 75234f5d..e045593c 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -65,9 +65,9 @@ jobs: - name: Upload coverage uses: actions/upload-artifact@v4 with: - name: coverage-${{ matrix.split }} + name: coverage-${{ matrix.python-version }}-${{ matrix.split }} include-hidden-files: true - overwrite: true + overwrite: false path: ./.coverage coverage: @@ -91,7 +91,7 @@ jobs: - name: Run coverage continue-on-error: true run: | - coverage combine coverage*/.coverage* + coverage combine coverage-3.10-* coverage report --show-missing - name: Upload coverage reports to Codecov From 2b5e07a769f18ce36977a15b68c4eaa556230098 Mon Sep 17 00:00:00 2001 From: Aakash Ashok Naik <91958822+naik-aakash@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:35:27 +0200 Subject: [PATCH 4/5] add pattern to filter coverage artifacts download --- .github/workflows/python-package.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index e045593c..fe6344fc 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -87,11 +87,13 @@ jobs: - name: Download coverage artifacts continue-on-error: true uses: actions/download-artifact@v4 + with: + pattern: coverage-3.10-* - name: Run coverage continue-on-error: true run: | - coverage combine coverage-3.10-* + coverage combine coverage*/.coverage* coverage report --show-missing - name: Upload coverage reports to Codecov From e3538ea4ec2222ecd014d918faa95190474508f8 Mon Sep 17 00:00:00 2001 From: Aakash Ashok Naik <91958822+naik-aakash@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:43:45 +0200 Subject: [PATCH 5/5] limit artifacts upload to python 3.10 only --- .github/workflows/python-package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index fe6344fc..ee941406 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -63,6 +63,7 @@ jobs: pytest --cov=lobsterpy --cov-report term-missing --cov-append --splits 6 --group ${{ matrix.split }} -vv --durations-path ./tests/test_data/.pytest-split-durations - name: Upload coverage + if: matrix.python-version == '3.10' uses: actions/upload-artifact@v4 with: name: coverage-${{ matrix.python-version }}-${{ matrix.split }}