Skip to content

Commit 1396a63

Browse files
authored
Merge 42cafec into e8c088c
2 parents e8c088c + 42cafec commit 1396a63

File tree

5 files changed

+31
-17
lines changed

5 files changed

+31
-17
lines changed

.github/workflows/build-sphinx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
build-and-deploy:
2626
name: Build and Deploy Docs
2727

28-
runs-on: ubuntu-latest
28+
runs-on: ubuntu-22.04
2929

3030
permissions:
3131
# Needed to cancel any previous runs that are not completed for a given workflow

.github/workflows/check-mkl-interfaces.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ env:
2828
2929
jobs:
3030
test_by_tag:
31-
name: Run on ['${{ matrix.os }}', python='${{ matrix.python }}'] with oneMKL tag
31+
name: Run tests with oneMKL tag
3232

3333
strategy:
3434
matrix:
@@ -121,7 +121,7 @@ jobs:
121121
SYCL_CACHE_PERSISTENT: 1
122122

123123
test_by_branch:
124-
name: Run on ['${{ matrix.os }}', python='${{ matrix.python }}'] with oneMKL develop branch
124+
name: Run tests with oneMKL develop branch
125125

126126
strategy:
127127
matrix:

.github/workflows/conda-package.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ env:
2525

2626
jobs:
2727
build:
28-
name: Build ['${{ matrix.os }}', python='${{ matrix.python }}']
28+
name: Build
2929

3030
strategy:
3131
matrix:
@@ -96,11 +96,11 @@ jobs:
9696
path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.PACKAGE_NAME }}-*.whl
9797

9898
test_linux:
99-
name: Test ['ubuntu-latest', python='${{ matrix.python }}']
99+
name: Test
100100

101101
needs: build
102102

103-
runs-on: ubuntu-latest
103+
runs-on: ${{ matrix.os }}
104104

105105
defaults:
106106
run:
@@ -109,6 +109,7 @@ jobs:
109109
strategy:
110110
matrix:
111111
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
112+
os: [ubuntu-latest]
112113

113114
continue-on-error: true
114115

@@ -199,11 +200,11 @@ jobs:
199200
python -m pytest -ra --pyargs ${{ env.PACKAGE_NAME }}.tests
200201
201202
test_windows:
202-
name: Test ['windows-2019', python='${{ matrix.python }}']
203+
name: Test
203204

204205
needs: build
205206

206-
runs-on: windows-2019
207+
runs-on: ${{ matrix.os }}
207208

208209
defaults:
209210
run:
@@ -212,6 +213,7 @@ jobs:
212213
strategy:
213214
matrix:
214215
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
216+
os: [windows-2019]
215217

216218
continue-on-error: true
217219

@@ -335,7 +337,7 @@ jobs:
335337
python -m pytest -ra --pyargs ${{ env.PACKAGE_NAME }}.tests
336338
337339
upload:
338-
name: Upload ['${{ matrix.os }}', python='${{ matrix.python }}']
340+
name: Upload
339341

340342
needs: [test_linux, test_windows]
341343

.github/workflows/cron-run-tests.yaml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@ env:
1515
PACKAGE_NAME: dpnp
1616
CHANNELS: '-c dppy/label/dev -c https://software.repos.intel.com/python/conda/ -c conda-forge --override-channels'
1717
TEST_ENV_NAME: test
18-
RERUN_TESTS_ON_FAILURE: 'true'
1918
RUN_TESTS_MAX_ATTEMPTS: 2
2019

2120
jobs:
2221
test:
23-
name: Test ['${{ matrix.runner }}', python='${{ matrix.python }}']
22+
name: Test
2423

2524
runs-on: ${{ matrix.runner }}
2625

@@ -33,12 +32,11 @@ jobs:
3332
actions: write
3433

3534
strategy:
35+
fail-fast: false
3636
matrix:
3737
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
3838
runner: [ubuntu-22.04, ubuntu-24.04, windows-2019]
3939

40-
continue-on-error: false
41-
4240
steps:
4341
- name: Cancel Previous Runs
4442
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
@@ -57,6 +55,19 @@ jobs:
5755
echo "Latest tag is ${{ steps.find_latest_tag.outputs.tag }}"
5856
5957
- name: Setup miniconda
58+
id: setup_miniconda
59+
continue-on-error: true
60+
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
61+
with:
62+
miniforge-version: latest
63+
use-mamba: 'true'
64+
channels: conda-forge
65+
conda-remove-defaults: 'true'
66+
python-version: ${{ matrix.python }}
67+
activate-environment: ${{ env.TEST_ENV_NAME }}
68+
69+
- name: ReSetup miniconda
70+
if: steps.setup_miniconda.outcome == 'failure'
6071
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
6172
with:
6273
miniforge-version: latest
@@ -95,14 +106,15 @@ jobs:
95106
python -c "import dpnp; print(dpnp.__version__)"
96107
97108
- name: Run tests
98-
if: env.RERUN_TESTS_ON_FAILURE != 'true'
109+
id: run_tests
110+
continue-on-error: true
99111
run: |
100112
python -m pytest -ra --pyargs ${{ env.PACKAGE_NAME }}.tests
101113
env:
102114
SYCL_CACHE_PERSISTENT: 1
103115

104116
- name: ReRun tests on Linux
105-
if: env.RERUN_TESTS_ON_FAILURE == 'true' && matrix.runner != 'windows-2019'
117+
if: steps.run_tests.outcome == 'failure' && matrix.runner != 'windows-2019'
106118
id: run_tests_linux
107119
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
108120
with:
@@ -119,7 +131,7 @@ jobs:
119131
SYCL_CACHE_PERSISTENT: 1
120132

121133
- name: ReRun tests on Windows
122-
if: env.RERUN_TESTS_ON_FAILURE == 'true' && matrix.runner == 'windows-2019'
134+
if: steps.run_tests.outcome == 'failure' && matrix.runner == 'windows-2019'
123135
id: run_tests_win
124136
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
125137
with:

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions: read-all
99

1010
jobs:
1111
pre-commit:
12-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-22.04
1313
steps:
1414
- name: Set up clang-format
1515
run: |

0 commit comments

Comments
 (0)