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