Skip to content

Commit a4aa964

Browse files
authored
Update Windows version used by GitHub CI (#1841)
The PR is indented to remove a temporary pinning to "windows-2019" and to revert changes from #1833. Besides Windows 2019 GitHub image is going to be fully unsupported by June 30, 2025. The impacted workflows are moved to use "windows-2022" GH runners. It requires updating `conda_build_config.yaml` where the version of the compiler as well as standard libraries have to be specified. While `{{ stdlib('c') }}` is installing into build environment as an alignment with recipe's meta yaml from conda-forge (see [dpctl#1868](IntelPython/dpctl#1868) as for reference).
1 parent 667fe3e commit a4aa964

File tree

5 files changed

+32
-16
lines changed

5 files changed

+32
-16
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ jobs:
6868
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
6969
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
7070
python: ['3.12']
71-
os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL
71+
os: [ubuntu-22.04] # windows-2022 - no DFT support for Windows in oneMKL
7272

7373
runs-on: ${{ matrix.os }}
7474

7575
defaults:
7676
run:
77-
shell: ${{ matrix.os == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
77+
shell: ${{ matrix.os == 'windows-2022' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
7878

7979
steps:
8080
- name: Checkout DPNP repo
@@ -158,13 +158,13 @@ jobs:
158158
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
159159
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
160160
python: ['3.12']
161-
os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL
161+
os: [ubuntu-22.04] # windows-2022 - no DFT support for Windows in oneMKL
162162

163163
runs-on: ${{ matrix.os }}
164164

165165
defaults:
166166
run:
167-
shell: ${{ matrix.os == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
167+
shell: ${{ matrix.os == 'windows-2022' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
168168

169169
env:
170170
onemkl-source-dir: '${{ github.workspace }}/onemkl/'

.github/workflows/conda-package.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
3535
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
3636
python: ['3.9', '3.10', '3.11', '3.12']
37-
os: [ubuntu-22.04, windows-2019]
37+
os: [ubuntu-22.04, windows-2022]
3838

3939
permissions:
4040
# Needed to cancel any previous runs that are not completed for a given workflow
@@ -44,7 +44,7 @@ jobs:
4444

4545
defaults:
4646
run:
47-
shell: ${{ matrix.os == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
47+
shell: ${{ matrix.os == 'windows-2022' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
4848

4949
env:
5050
build-conda-pkg-env: 'environments/build_conda_pkg.yml'
@@ -264,7 +264,7 @@ jobs:
264264
matrix:
265265
# python 3.13 is blocked due to MKL issue
266266
python: ['3.9', '3.10', '3.11', '3.12']
267-
os: [windows-2019]
267+
os: [windows-2022]
268268

269269
env:
270270
dpnp-repo-path: '${{ github.workspace }}\source'
@@ -422,13 +422,13 @@ jobs:
422422
matrix:
423423
# python 3.13 is blocked due to MKL issue
424424
python: ['3.9', '3.10', '3.11', '3.12']
425-
os: [ubuntu-22.04, windows-2019]
425+
os: [ubuntu-22.04, windows-2022]
426426

427427
runs-on: ${{ matrix.os }}
428428

429429
defaults:
430430
run:
431-
shell: ${{ matrix.os == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
431+
shell: ${{ matrix.os == 'windows-2022' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
432432

433433
env:
434434
upload-conda-pkg-env: 'environments/upload_cleanup_conda_pkg.yml'

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
defaults:
3131
run:
32-
shell: ${{ matrix.runner == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
32+
shell: ${{ matrix.runner == 'windows-2022' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
3333

3434
permissions:
3535
# Needed to cancel any previous runs that are not completed for a given workflow
@@ -41,7 +41,7 @@ jobs:
4141
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
4242
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
4343
python: ['3.9', '3.10', '3.11', '3.12']
44-
runner: [ubuntu-22.04, ubuntu-24.04, windows-2019]
44+
runner: [ubuntu-22.04, ubuntu-24.04, windows-2022]
4545

4646
steps:
4747
- name: Cancel Previous Runs
@@ -98,7 +98,7 @@ jobs:
9898
run: mamba list
9999

100100
- name: Activate OCL CPU RT
101-
if: matrix.runner == 'windows-2019'
101+
if: matrix.runner == 'windows-2022'
102102
shell: pwsh
103103
run: |
104104
$script_path="$env:CONDA_PREFIX\Scripts\set-intel-ocl-icd-registry.ps1"
@@ -125,7 +125,7 @@ jobs:
125125
SYCL_CACHE_PERSISTENT: 1
126126

127127
- name: ReRun tests on Linux
128-
if: steps.run_tests.outcome == 'failure' && matrix.runner != 'windows-2019'
128+
if: steps.run_tests.outcome == 'failure' && matrix.runner != 'windows-2022'
129129
id: run_tests_linux
130130
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
131131
with:
@@ -142,7 +142,7 @@ jobs:
142142
SYCL_CACHE_PERSISTENT: 1
143143

144144
- name: ReRun tests on Windows
145-
if: steps.run_tests.outcome == 'failure' && matrix.runner == 'windows-2019'
145+
if: steps.run_tests.outcome == 'failure' && matrix.runner == 'windows-2022'
146146
id: run_tests_win
147147
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
148148
with:

conda-recipe/conda_build_config.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,18 @@
11
numpy:
2-
- 1.23
2+
- '1.25'
3+
c_compiler: # [linux]
4+
- gcc # [linux]
5+
cxx_compiler: # [linux]
6+
- gxx # [linux]
7+
cxx_compiler_version: # [linux]
8+
- '14' # [linux]
9+
c_stdlib: # [linux]
10+
- sysroot # [linux]
11+
c_stdlib_version: # [linux]
12+
- '2.28' # [linux]
13+
c_stdlib: # [win]
14+
- vs # [win]
15+
cxx_compiler: # [win]
16+
- vs2022 # [win]
17+
c_compiler: # [win]
18+
- vs2022 # [win]

conda-recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ requirements:
3737
- tbb-devel
3838
build:
3939
- {{ compiler('cxx') }}
40+
- {{ stdlib('c') }}
4041
- {{ compiler('dpcpp') }} >={{ required_compiler_and_mkl_version }},<{{ max_compiler_and_mkl_version }}
41-
- sysroot_linux-64 >=2.28 # [linux]
4242
run:
4343
- python
4444
- {{ pin_compatible('dpctl', min_pin='x.x.x', max_pin=None) }}

0 commit comments

Comments
 (0)