|
26 | 26 | strategy:
|
27 | 27 | matrix:
|
28 | 28 | env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml, actions-311.yaml]
|
29 |
| - pattern: ["not single_cpu", "single_cpu"] |
| 29 | + # Prevent the include jobs from overriding other jobs |
| 30 | + pattern: [""] |
30 | 31 | pyarrow_version: ["8", "9", "10"]
|
31 | 32 | include:
|
32 | 33 | - name: "Downstream Compat"
|
@@ -100,7 +101,7 @@ jobs:
|
100 | 101 | PANDAS_COPY_ON_WRITE: ${{ matrix.pandas_copy_on_write || '0' }}
|
101 | 102 | PANDAS_CI: ${{ matrix.pandas_ci || '1' }}
|
102 | 103 | TEST_ARGS: ${{ matrix.test_args || '' }}
|
103 |
| - PYTEST_WORKERS: ${{ contains(matrix.pattern, 'not single_cpu') && 'auto' || '1' }} |
| 104 | + PYTEST_WORKERS: 'auto' |
104 | 105 | PYTEST_TARGET: ${{ matrix.pytest_target || 'pandas' }}
|
105 | 106 | IS_PYPY: ${{ contains(matrix.env_file, 'pypy') }}
|
106 | 107 | # TODO: re-enable coverage on pypy, its slow
|
@@ -169,9 +170,22 @@ jobs:
|
169 | 170 | pyarrow-version: ${{ matrix.pyarrow_version }}
|
170 | 171 |
|
171 | 172 | - name: Build Pandas
|
| 173 | + id: build |
172 | 174 | uses: ./.github/actions/build_pandas
|
173 | 175 |
|
174 |
| - - name: Test |
| 176 | + - name: Test (not single_cpu) |
175 | 177 | uses: ./.github/actions/run-tests
|
176 | 178 | # TODO: Don't continue on error for PyPy
|
177 | 179 | continue-on-error: ${{ env.IS_PYPY == 'true' }}
|
| 180 | + env: |
| 181 | + # Set pattern to not single_cpu if not already set |
| 182 | + PATTERN: ${{ env.PATTERN == '' && 'not single_cpu' || matrix.pattern }} |
| 183 | + |
| 184 | + - name: Test (single_cpu) |
| 185 | + uses: ./.github/actions/run-tests |
| 186 | + # TODO: Don't continue on error for PyPy |
| 187 | + continue-on-error: ${{ env.IS_PYPY == 'true' }} |
| 188 | + env: |
| 189 | + PATTERN: 'single_cpu' |
| 190 | + PYTEST_WORKERS: 1 |
| 191 | + if: ${{ matrix.pattern == '' && (always() && steps.build.outcome == 'success')}} |
0 commit comments