Skip to content

Commit c1e0bbd

Browse files
dzenanzdzenanz
authored
Merge pull request #172 from dzenanz/greenCI
Further fixes to CI
2 parents 50aef61 + 9c29d10 commit c1e0bbd

2 files changed

Lines changed: 19 additions & 21 deletions

File tree

‎.github/workflows/build-test-package.yml‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
max-parallel: 3
2222
matrix:
2323
# macos-15 is arm64 by default
24-
os: [ubuntu-24.04, windows-2022, macos-15-intel, macos-15]
24+
os: [ubuntu-24.04, windows-2025-vs2026, macos-15-intel, macos-15]
2525
include:
2626
- os: ubuntu-24.04
2727
c-compiler: "gcc"
2828
cxx-compiler: "g++"
2929
cmake-build-type: "MinSizeRel"
30-
- os: windows-2022
30+
- os: windows-2025-vs2026
3131
c-compiler: "cl.exe"
3232
cxx-compiler: "cl.exe"
3333
cmake-build-type: "Release"
@@ -78,7 +78,7 @@ jobs:
7878
git checkout ${{ env.itk-git-tag }}
7979
8080
- name: Build ITK
81-
if: matrix.os != 'windows-2022'
81+
if: matrix.os != 'windows-2025-vs2026'
8282
shell: bash
8383
run: |
8484
cd ..
@@ -88,14 +88,14 @@ jobs:
8888
ninja
8989
9090
- name: Build ITK
91-
if: matrix.os == 'windows-2022'
91+
if: matrix.os == 'windows-2025-vs2026'
9292
shell: pwsh
9393
run: |
9494
Set-PSDebug -Trace 1
9595
cd ..
9696
mkdir ITK-build
9797
cd ITK-build
98-
& "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" -Arch amd64 -SkipAutomaticLocation
98+
& "C:\Program Files\Microsoft Visual Studio\18\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" -Arch amd64 -SkipAutomaticLocation
9999
cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -GNinja ../ITK
100100
ninja
101101
@@ -154,23 +154,23 @@ jobs:
154154
cat dashboard.cmake
155155
156156
- name: Build and test
157-
if: matrix.os != 'windows-2022'
157+
if: matrix.os != 'windows-2025-vs2026'
158158
run: |
159159
ctest --output-on-failure -j 2 -V -S dashboard.cmake
160160
161161
- name: Build and test
162-
if: matrix.os == 'windows-2022'
162+
if: matrix.os == 'windows-2025-vs2026'
163163
shell: pwsh
164164
run: |
165-
& "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" -Arch amd64 -SkipAutomaticLocation
165+
& "C:\Program Files\Microsoft Visual Studio\18\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" -Arch amd64 -SkipAutomaticLocation
166166
ctest --output-on-failure -j 2 -V -S dashboard.cmake
167167
168168
build-linux-python-packages:
169169
runs-on: ubuntu-24.04
170170
strategy:
171171
max-parallel: 2
172172
matrix:
173-
python-version: ["39", "310", "311","312","313"]
173+
python-version: ["311"]
174174

175175
steps:
176176
- uses: actions/checkout@v7.0.1
@@ -211,12 +211,9 @@ jobs:
211211
cd "${GITHUB_WORKSPACE}/Evaluated/ITKModuleTemplate"
212212
export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
213213
export ITKPYTHONPACKAGE_TAG=${{ env.itk-python-package-tag }}
214-
for manylinux_version in "_2_28" "2014"; do
215-
rm -rf ITKPythonPackage
216-
export MANYLINUX_VERSION=${manylinux_version}
217-
echo "Building for manylinux specialization ${MANYLINUX_VERSION}"
218-
../../dockcross-manylinux-download-cache-and-build-module-wheels.sh cp${{ matrix.python-version }}
219-
done
214+
# ITKPythonBuilds provides only manylinux_2_28 archives since ITK 6
215+
export MANYLINUX_VERSION=_2_28
216+
../../dockcross-manylinux-download-cache-and-build-module-wheels.sh cp${{ matrix.python-version }}
220217
221218
- name: Publish Python package as GitHub Artifact
222219
uses: actions/upload-artifact@v7.0.1
@@ -225,11 +222,12 @@ jobs:
225222
path: Evaluated/ITKModuleTemplate/dist
226223

227224
build-macos-python-packages:
228-
runs-on: macos-15-intel
225+
# ITKPythonBuilds provides only arm64 macOS archives since ITK 6
226+
runs-on: macos-15
229227
strategy:
230228
max-parallel: 2
231229
matrix:
232-
python3-minor-version: ["9", "10", "11", "12", "13"]
230+
python3-minor-version: ["11"]
233231

234232
steps:
235233
- uses: actions/checkout@v7.0.1
@@ -275,11 +273,11 @@ jobs:
275273
path: Evaluated/ITKModuleTemplate/dist
276274

277275
build-windows-python-packages:
278-
runs-on: windows-2022
276+
runs-on: windows-2025-vs2026
279277
strategy:
280278
max-parallel: 2
281279
matrix:
282-
python-version-minor: ["9", "10", "11"]
280+
python-version-minor: ["11"]
283281

284282
steps:
285283
- uses: actions/checkout@v7.0.1
@@ -333,7 +331,7 @@ jobs:
333331
shell: cmd
334332
run: |
335333
cd Evaluated/ITKModuleTemplate
336-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
334+
call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
337335
set PATH=C:\P\grep;%PATH%
338336
set CC=cl.exe
339337
set CXX=cl.exe

‎{{cookiecutter.project_name}}/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ classifiers = [
3333
"Topic :: Scientific/Engineering :: Medical Science Apps.",
3434
"Topic :: Software Development :: Libraries",
3535
]
36-
requires-python = ">=3.9"
36+
requires-python = ">=3.11"
3737
dependencies = [
3838
"itk == 5.4.*",
3939
]

0 commit comments

Comments
 (0)