Skip to content

Commit bdc6af9

Browse files
committed
COMP: Update the CI package dependancies
Update supported many wheels for https://github.com/pypa/manylinux
1 parent bba02e2 commit bdc6af9

File tree

3 files changed

+35
-32
lines changed

3 files changed

+35
-32
lines changed

.github/workflows/build-test-cxx.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ jobs:
3636
strategy:
3737
max-parallel: 3
3838
matrix:
39-
os: [ubuntu-22.04, windows-2022, macos-13, macos-15]
39+
os: [ubuntu-24.04, windows-2022, macos-13, macos-15]
4040
include:
41-
- os: ubuntu-22.04
41+
- os: ubuntu-24.04
4242
c-compiler: "gcc"
4343
cxx-compiler: "g++"
4444
cmake-build-type: "MinSizeRel"
@@ -56,16 +56,16 @@ jobs:
5656
cmake-build-type: "MinSizeRel"
5757

5858
steps:
59-
- uses: actions/checkout@v4
59+
- uses: actions/checkout@v4.2.2
6060

6161
- name: Free Disk Space (Ubuntu)
62-
if: matrix.os == 'ubuntu-22.04'
62+
if: matrix.os == 'ubuntu-24.04'
6363
uses: jlumbroso/free-disk-space@v1.3.1
6464
with:
6565
large-packages: false
6666

6767
- name: Set up Python 3.11
68-
uses: actions/setup-python@v5
68+
uses: actions/setup-python@v5.4.0
6969
with:
7070
python-version: "3.11"
7171

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

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,16 @@ on:
3535
description: 'JSON-formatted array of Python 3.x minor version wheel targets'
3636
required: false
3737
type: string
38-
default: '["8","9","10","11"]'
38+
default: '["9","10","11","12"]'
3939
manylinux-platforms:
4040
description: 'JSON-formatted array of "<manylinux-image>-<arch>" specializations'
4141
required: false
4242
type: string
43-
default: '["_2_28-x64","2014-x64","_2_28-aarch64"]'
43+
# Select configurations from https://github.com/pypa/manylinux
44+
# "_2_34-x86_64" -- most commonly used platform for developers (largest use case)
45+
# "_2_34-aarch64" -- developers with aarch64 likely use quite modern os
46+
# "2014-x86_64" -- fallback packages for deployments to older OS's (i.e. computational cluster environments)
47+
default: '["_2_34-x86_64","_2_34-aarch64","2014-x86_64"]'
4448
macosx-deployment-target:
4549
description: 'A string to provide as MACOSX_DEPLOYMENT_TARGET, e.g. "10.15". If left empty (default), the per-architecture default will be used.'
4650
required: false
@@ -58,15 +62,15 @@ on:
5862
jobs:
5963

6064
build-linux-py:
61-
runs-on: ubuntu-22.04
65+
runs-on: ubuntu-24.04
6266
strategy:
6367
max-parallel: 2
6468
matrix:
6569
python3-minor-version: ${{ fromJSON(inputs.python3-minor-versions) }}
6670
manylinux-platform: ${{ fromJSON(inputs.manylinux-platforms) }}
6771

6872
steps:
69-
- uses: actions/checkout@v4
73+
- uses: actions/checkout@v4.2.2
7074

7175
- name: Free Disk Space (Ubuntu)
7276
uses: jlumbroso/free-disk-space@v1.3.1
@@ -105,7 +109,7 @@ jobs:
105109
./dockcross-manylinux-download-cache-and-build-module-wheels.sh cp3${{ matrix.python3-minor-version }} $CMAKE_OPTIONS
106110
107111
- name: Set up Python 3.11 for Validation
108-
uses: actions/setup-python@v5
112+
uses: actions/setup-python@v5.4.0
109113
with:
110114
python-version: "3.11"
111115

@@ -133,14 +137,14 @@ jobs:
133137
path: dist/*.whl
134138

135139
build-macos-py:
136-
runs-on: macos-12
140+
runs-on: macos-15
137141
strategy:
138142
max-parallel: 2
139143
matrix:
140144
python3-minor-version: ${{ fromJSON(inputs.python3-minor-versions) }}
141145

142146
steps:
143-
- uses: actions/checkout@v4
147+
- uses: actions/checkout@v4.2.2
144148

145149
- name: 'Specific XCode version'
146150
run: |
@@ -178,7 +182,7 @@ jobs:
178182
./macpython-download-cache-and-build-module-wheels.sh $CMAKE_OPTIONS "3.${{ matrix.python3-minor-version }}"
179183
180184
- name: Set up Python 3.11 for Validation
181-
uses: actions/setup-python@v5
185+
uses: actions/setup-python@v5.4.0
182186
with:
183187
python-version: "3.11"
184188

@@ -206,14 +210,14 @@ jobs:
206210
path: dist/*.whl
207211

208212
build-macos-arm-py:
209-
runs-on: macos-14
213+
runs-on: macos-15
210214
strategy:
211215
max-parallel: 2
212216
matrix:
213217
python3-minor-version: ${{ fromJSON(inputs.python3-minor-versions) }}
214218

215219
steps:
216-
- uses: actions/checkout@v4
220+
- uses: actions/checkout@v4.2.2
217221

218222
- name: 'Specific XCode version'
219223
run: |
@@ -253,7 +257,7 @@ jobs:
253257
./macpython-download-cache-and-build-module-wheels.sh $CMAKE_OPTIONS "3.${{ matrix.python3-minor-version }}"
254258
255259
- name: Set up Python 3.11 for Validation
256-
uses: actions/setup-python@v5
260+
uses: actions/setup-python@v5.4.0
257261
with:
258262
python-version: "3.11"
259263

@@ -293,7 +297,7 @@ jobs:
293297
- name: Get specific version of CMake, Ninja
294298
uses: lukka/get-cmake@v3.29.0
295299

296-
- uses: actions/checkout@v4
300+
- uses: actions/checkout@v4.2.2
297301
with:
298302
path: "im"
299303

@@ -338,7 +342,7 @@ jobs:
338342
cp 'dist\*.whl' '${{ github.workspace }}\dist'
339343
340344
- name: Set up Python 3.11 for Validation
341-
uses: actions/setup-python@v5
345+
uses: actions/setup-python@v5.4.0
342346
with:
343347
python-version: "3.11"
344348

@@ -363,12 +367,12 @@ jobs:
363367
if: inputs.test-notebooks
364368
needs:
365369
- build-linux-py
366-
runs-on: ubuntu-22.04
370+
runs-on: ubuntu-24.04
367371

368372
steps:
369-
- uses: actions/checkout@v4
373+
- uses: actions/checkout@v4.2.2
370374

371-
- uses: actions/setup-python@v5
375+
- uses: actions/setup-python@v5.4.0
372376
with:
373377
python-version: "3.${{ fromJSON(inputs.python3-minor-versions)[0] }}"
374378

@@ -411,7 +415,7 @@ jobs:
411415
- build-macos-py
412416
- build-macos-arm-py
413417
- build-windows-python-packages
414-
runs-on: ubuntu-22.04
418+
runs-on: ubuntu-24.04
415419

416420
steps:
417421
- name: Download Python Packages

README.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ on: [push,pull_request]
8787

8888
jobs:
8989
cxx-build-workflow:
90-
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@d4a5ce4f219b66b78269a15392e15c95f90e7e00
90+
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@bba02e2438336fc309d56a4ad8e588680e2c7f12
9191
with:
9292
itk-cmake-options: '-DITK_BUILD_DEFAULT_MODULES:BOOL=OFF -DITKGroup_Core:BOOL=ON'
9393

9494
python-build-workflow:
95-
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@d4a5ce4f219b66b78269a15392e15c95f90e7e00
95+
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@bba02e2438336fc309d56a4ad8e588680e2c7f12
9696
secrets:
9797
pypi_password: ${{ secrets.pypi_password }}
9898
```
@@ -117,7 +117,7 @@ The top-level jobs used to organize the run. Reusable workflows may provide mult
117117

118118
```yaml
119119
cxx-build-workflow:
120-
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@d4a5ce4f219b66b78269a15392e15c95f90e7e00
120+
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@bba02e2438336fc309d56a4ad8e588680e2c7f12
121121
```
122122
Tells GHA to fetch and run the `build-test-cxx.yml` workflow.
123123
A commit hash or tagged version may be provided.
@@ -132,7 +132,7 @@ certain modules are built before the external module itself is subsequently buil
132132

133133
```yaml
134134
python-build-workflow:
135-
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@d4a5ce4f219b66b78269a15392e15c95f90e7e00
135+
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@bba02e2438336fc309d56a4ad8e588680e2c7f12
136136
```
137137
Tells GHA to fetch and run the `build-test-package-python.yml` workflow.
138138
A commit hash or tagged version may be provided.
@@ -348,12 +348,11 @@ The `build-test-cxx` workflow supports building and running C++ tests on GitHub
348348
Windows, Linux, and macOS. Image details are available [here](https://github.com/actions/runner-images).
349349

350350
The `build-test-package-python.yml` workflow supports Python package generation for the following platforms and architectures:
351-
- Windows 10 x86_64 platforms
352-
- Windows 11 x86_64 platforms
353-
- macOS 10.9+ x86_64 platforms
354-
- macOS 11.0+ ARM64 platforms
355-
- Linux glibc 2.17+ (E.g. Ubuntu 18.04+) x86_64 platforms
356-
- Linux glibc 2.28+ (E.g. Ubuntu 20.04+) aarch64 (ARMv8) platforms
351+
- Windows 11 x86_64 platforms (windows-2022)
352+
- macOS 11.0+ x86_64 platforms (macos-14)
353+
- macOS 13.0+ ARM64 platforms (macos-15)
354+
- Linux glibc 2.17+ (E.g. Ubuntu 18.04+) x86_64 platforms (See: https://github.com/pypa/manylinux for details)
355+
- Linux glibc 2.28+ (E.g. Ubuntu 20.04+) aarch64 (ARMv8) platforms (See: https://github.com/pypa/manylinux for details)
357356

358357
### What should I do if my target platform/architecture does not appear on the list above?
359358

0 commit comments

Comments
 (0)