|
48 | 48 | uses: actions/cache/restore@v3
|
49 | 49 | with:
|
50 | 50 | path: /home/runner/.cache/ccache
|
51 |
| - key: ccache-${{ matrix.c-compiler }}-${{ matrix.py-version }} |
| 51 | + key: ccache-${{ runner.os }}-${{ matrix.c-compiler }}-${{ matrix.py-version }} |
52 | 52 |
|
53 | 53 | - uses: actions/setup-python@v4
|
54 | 54 | if: always()
|
@@ -80,52 +80,52 @@ jobs:
|
80 | 80 | GH_TOKEN: ${{ github.token }}
|
81 | 81 | run: |
|
82 | 82 | gh extension install actions/gh-actions-cache
|
83 |
| - gh actions-cache delete ccache-${{ matrix.c-compiler}}-${{ matrix.py-version }} --confirm |
| 83 | + gh actions-cache delete ccache-${{ runner.os }}-${{ matrix.c-compiler}}-${{ matrix.py-version }} --confirm |
84 | 84 | continue-on-error: true
|
85 | 85 |
|
86 | 86 | - name: Push ccache cache
|
87 | 87 | if: always()
|
88 | 88 | uses: actions/cache/save@v3
|
89 | 89 | with:
|
90 | 90 | path: /home/runner/.cache/ccache
|
91 |
| - key: ccache-${{ matrix.c-compiler }}-${{ matrix.py-version }} |
| 91 | + key: ccache-${{ runner.os }}-${{ matrix.c-compiler }}-${{ matrix.py-version }} |
92 | 92 |
|
93 | 93 | - name: Ccache report
|
94 | 94 | if: always()
|
95 | 95 | run: ccache -s
|
96 | 96 |
|
97 | 97 | - name: Run tests
|
98 | 98 | if: always()
|
99 |
| - run: python3 -m pytest --junit-xml=test-results-${{ matrix.c-compiler }}-${{ matrix.py-version }}.xml tests/ |
| 99 | + run: python3 -m pytest --junit-xml=test-results-${{ runner.os }}-${{ matrix.c-compiler }}-${{ matrix.py-version }}.xml tests/ |
100 | 100 |
|
101 | 101 | - name: Run flake8
|
102 | 102 | if: always()
|
103 | 103 | run: |
|
104 | 104 | make flake8
|
105 |
| - mv flake8.xml flake8-${{ matrix.c-compiler }}-${{ matrix.py-version }}.xml |
| 105 | + mv flake8.xml flake8-${{ runner.os }}-${{ matrix.c-compiler }}-${{ matrix.py-version }}.xml |
106 | 106 |
|
107 | 107 | - name: Archive test results
|
108 | 108 | uses: actions/upload-artifact@v3
|
109 | 109 | if: always()
|
110 | 110 | with:
|
111 | 111 | name: Test results
|
112 |
| - path: test-results-${{ matrix.c-compiler }}-${{ matrix.py-version }}.xml |
| 112 | + path: test-results-${{ runner.os }}-${{ matrix.c-compiler }}-${{ matrix.py-version }}.xml |
113 | 113 |
|
114 | 114 | - name: Report test results
|
115 | 115 | uses: dorny/test-reporter@v1
|
116 | 116 | if: always()
|
117 | 117 | with:
|
118 |
| - name: Test report (${{ matrix.c-compiler }}, Python ${{ matrix.py-version }}) |
119 |
| - path: test-results-${{ matrix.c-compiler }}-${{ matrix.py-version }}.xml |
| 118 | + name: Test report (${{ runner.os }}, ${{ matrix.c-compiler }}, Python ${{ matrix.py-version }}) |
| 119 | + path: test-results-${{ runner.os }}-${{ matrix.c-compiler }}-${{ matrix.py-version }}.xml |
120 | 120 | reporter: java-junit
|
121 | 121 | fail-on-error: true
|
122 | 122 |
|
123 | 123 | - name: Report flake8 results
|
124 | 124 | uses: dorny/test-reporter@v1
|
125 | 125 | if: always()
|
126 | 126 | with:
|
127 |
| - name: Flake8 report (${{ matrix.c-compiler }}, Python ${{ matrix.py-version }}) |
128 |
| - path: flake8-${{ matrix.c-compiler }}-${{ matrix.py-version }}.xml |
| 127 | + name: Flake8 report (${{ runner.os }}, ${{ matrix.c-compiler }}, Python ${{ matrix.py-version }}) |
| 128 | + path: flake8-${{ runner.os }}-${{ matrix.c-compiler }}-${{ matrix.py-version }}.xml |
129 | 129 | reporter: java-junit
|
130 | 130 | fail-on-error: false
|
131 | 131 |
|
@@ -157,7 +157,7 @@ jobs:
|
157 | 157 | uses: actions/cache/restore@v3
|
158 | 158 | with:
|
159 | 159 | path: /Users/runner/Library/Caches/ccache
|
160 |
| - key: ccache-mac-${{ matrix.py-version }} |
| 160 | + key: ccache-${{ runner.os }}-${{ matrix.py-version }} |
161 | 161 |
|
162 | 162 | - name: Setup GNU Fortran
|
163 | 163 | uses: modflowpy/install-gfortran-action@v1
|
@@ -189,36 +189,36 @@ jobs:
|
189 | 189 | GH_TOKEN: ${{ github.token }}
|
190 | 190 | run: |
|
191 | 191 | gh extension install actions/gh-actions-cache
|
192 |
| - gh actions-cache delete ccache-mac-${{ matrix.py-version }} --confirm |
| 192 | + gh actions-cache delete ccache-${{ runner.os }}-${{ matrix.py-version }} --confirm |
193 | 193 | continue-on-error: true
|
194 | 194 |
|
195 | 195 | - name: Push ccache cache
|
196 | 196 | if: always()
|
197 | 197 | uses: actions/cache/save@v3
|
198 | 198 | with:
|
199 | 199 | path: /Users/runner/Library/Caches/ccache
|
200 |
| - key: ccache-mac-${{ matrix.py-version }} |
| 200 | + key: ccache-${{ runner.os }}-${{ matrix.py-version }} |
201 | 201 |
|
202 | 202 | - name: Ccache report
|
203 | 203 | if: always()
|
204 | 204 | run: ccache -s
|
205 | 205 |
|
206 | 206 | - name: Run tests
|
207 | 207 | if: always()
|
208 |
| - run: python3 -m pytest --junit-xml=test-results-Mac-${{ matrix.py-version }}.xml tests/ |
| 208 | + run: python3 -m pytest --junit-xml=test-results-${{ runner.os }}-${{ matrix.py-version }}.xml tests/ |
209 | 209 |
|
210 | 210 | - name: Archive test results
|
211 | 211 | uses: actions/upload-artifact@v3
|
212 | 212 | if: always()
|
213 | 213 | with:
|
214 | 214 | name: Test results
|
215 |
| - path: test-results-${{ matrix.py-version }}.xml |
| 215 | + path: test-results-${{ runner.os }}-${{ matrix.py-version }}.xml |
216 | 216 |
|
217 | 217 | - name: Report test results
|
218 | 218 | uses: dorny/test-reporter@v1
|
219 | 219 | if: always()
|
220 | 220 | with:
|
221 |
| - name: Test report (Mac, Python ${{ matrix.py-version }}) |
222 |
| - path: test-results-Mac-${{ matrix.py-version }}.xml |
| 221 | + name: Test report (${{ runner.os }}, Python ${{ matrix.py-version }}) |
| 222 | + path: test-results-${{ runner.os }}-${{ matrix.py-version }}.xml |
223 | 223 | reporter: java-junit
|
224 | 224 | fail-on-error: true
|
0 commit comments