Skip to content

Commit 5935e53

Browse files
committed
Merge branch 'main' into poetry-update
2 parents 523ff7c + e05d850 commit 5935e53

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

.github/workflows/ci_poetry.yml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,15 @@ jobs:
4343
run: poetry install --with dev --without docs --no-interaction
4444

4545
- name: Test core library with pytest
46+
env:
47+
COVERAGE_FILE: coverage-data-core-${{ matrix.python-version }}
4648
run: poetry run coverage run -m pytest tests --ignore tests/tasks --ignore tests/dev
4749

4850
- name: Upload coverage data
49-
uses: actions/upload-artifact@v3
51+
uses: actions/upload-artifact@v4
5052
with:
51-
name: coverage-data
52-
path: ".coverage*"
53+
name: coverage-data-core-${{ matrix.python-version }}
54+
path: coverage-data-core-${{ matrix.python-version }}*
5355

5456
tests_tasks:
5557
name: "Tasks, Python ${{ matrix.python-version }}"
@@ -96,13 +98,15 @@ jobs:
9698
key: pooch-cache
9799

98100
- name: Test tasks with pytest
101+
env:
102+
COVERAGE_FILE: coverage-data-tasks-${{ matrix.python-version }}
99103
run: poetry run coverage run -m pytest tests/dev tests/tasks -s --log-cli-level info
100104

101105
- name: Upload coverage data
102-
uses: actions/upload-artifact@v3
106+
uses: actions/upload-artifact@v4
103107
with:
104-
name: coverage-data
105-
path: ".coverage*"
108+
name: coverage-data-tasks-${{ matrix.python-version }}
109+
path: coverage-data-tasks-${{ matrix.python-version }}*
106110

107111
coverage:
108112
name: Coverage
@@ -119,16 +123,24 @@ jobs:
119123
run: python -m pip install --upgrade coverage[toml]
120124

121125
- name: Download data
122-
uses: actions/download-artifact@v3
126+
uses: actions/download-artifact@v4
123127
with:
124-
name: coverage-data
128+
pattern: coverage-data-*
129+
merge-multiple: true
130+
131+
- name: Combine coverage
132+
# Combines all the downloaded coverage artifacts in a single `.coverage` file,
133+
# which will then be used by `py-cov-action/python-coverage-comment-action`.
134+
# We added this step to replace the variable `MERGE_COVERAGE_FILES: true`
135+
# in the next step, which had started to raise errors
136+
# (https://github.com/fractal-analytics-platform/fractal-server/pull/1725).
137+
run: coverage combine coverage-data-*
125138

126139
- name: Add coverage comment to Pull Requests
127140
id: coverage_comment
128141
uses: py-cov-action/python-coverage-comment-action@v3
129142
with:
130143
GITHUB_TOKEN: ${{ github.token }}
131-
MERGE_COVERAGE_FILES: true
132144
MINIMUM_GREEN: 90
133145
MINIMUM_ORANGE: 60
134146
ANNOTATE_MISSING_LINES: true

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* Use latest version of Zenodo tiny-ome-zarr dataset (\#817).
77
* Relax pip-version constraint in external-packages-manifest tests (\#825).
88
* Run pip-based CI also regularly and on-demand (\#829).
9+
* Update GitHub actions for upload/download/coverage (\#832).
910
* Dependencies:
1011
* Require `stackview<=0.9.0` (\#829).
1112
* Documentation:

0 commit comments

Comments
 (0)