Skip to content

Commit c0c0fc3

Browse files
thewtexthewtex
committed
COMP: Bump CI images to latest versions
- windows-2022 - ubuntu-22.04 - macos-12 And other Action dependencies.
1 parent a428ef2 commit c0c0fc3

File tree

4 files changed

+1529
-1061
lines changed

4 files changed

+1529
-1061
lines changed

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

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ jobs:
1111
strategy:
1212
max-parallel: 3
1313
matrix:
14-
os: [ubuntu-20.04, windows-2019, macos-11]
14+
os: [ubuntu-22.04, windows-2022, macos-12]
1515
include:
16-
- os: ubuntu-20.04
16+
- os: ubuntu-22.04
1717
c-compiler: "gcc"
1818
cxx-compiler: "g++"
1919
cmake-build-type: "MinSizeRel"
20-
- os: windows-2019
20+
- os: windows-2022
2121
c-compiler: "cl.exe"
2222
cxx-compiler: "cl.exe"
2323
cmake-build-type: "Release"
24-
- os: macos-11
24+
- os: macos-12
2525
c-compiler: "clang"
2626
cxx-compiler: "clang++"
2727
cmake-build-type: "MinSizeRel"
@@ -31,10 +31,10 @@ jobs:
3131
with:
3232
path: Ex
3333

34-
- name: Set up Python 3.7
34+
- name: Set up Python 3.9
3535
uses: actions/setup-python@v1
3636
with:
37-
python-version: 3.7
37+
python-version: 3.9
3838

3939
- name: Install build dependencies
4040
run: |
@@ -52,20 +52,20 @@ jobs:
5252
git checkout ${{ env.itk-git-tag }}
5353
5454
- name: Build ITK
55-
if: matrix.os != 'windows-2019'
55+
if: matrix.os != 'windows-2022'
5656
run: |
5757
cd ..
5858
mkdir ITK-build
5959
cd ITK-build
6060
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
6161
ninja
6262
- name: Build ITK
63-
if: matrix.os == 'windows-2019'
63+
if: matrix.os == 'windows-2022'
6464
run: |
6565
cd ..
6666
mkdir ITK-build
6767
cd ITK-build
68-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
68+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
6969
cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -GNinja ../ITK
7070
ninja
7171
shell: cmd
@@ -115,13 +115,13 @@ jobs:
115115
EOF
116116
cat dashboard.cmake
117117
- name: Build and test
118-
if: matrix.os != 'windows-2019'
118+
if: matrix.os != 'windows-2022'
119119
run: |
120120
ctest -j 2 -VV -S dashboard.cmake
121121
- name: Build and test
122-
if: matrix.os == 'windows-2019'
122+
if: matrix.os == 'windows-2022'
123123
run: |
124-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
124+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
125125
ctest -j 2 -VV -S dashboard.cmake
126126
shell: cmd
127127

@@ -130,17 +130,17 @@ jobs:
130130
strategy:
131131
max-parallel: 3
132132
matrix:
133-
os: [ubuntu-20.04, windows-2019, macos-11]
133+
os: [ubuntu-22.04, windows-2022, macos-12]
134134
include:
135135
- os: ubuntu-20.04
136136
c-compiler: "gcc"
137137
cxx-compiler: "g++"
138138
cmake-build-type: "MinSizeRel"
139-
- os: windows-2019
139+
- os: windows-2022
140140
c-compiler: "cl.exe"
141141
cxx-compiler: "cl.exe"
142142
cmake-build-type: "Release"
143-
- os: macos-11
143+
- os: macos-12
144144
c-compiler: "clang"
145145
cxx-compiler: "clang++"
146146
cmake-build-type: "MinSizeRel"
@@ -150,10 +150,10 @@ jobs:
150150
with:
151151
path: Ex
152152

153-
- name: Set up Python 3.7
154-
uses: actions/setup-python@v1
153+
- name: Set up Python 3.9
154+
uses: actions/setup-python@v3
155155
with:
156-
python-version: 3.7
156+
python-version: 3.9
157157

158158
- name: Install build dependencies
159159
run: |
@@ -213,14 +213,14 @@ jobs:
213213
cat dashboard.cmake
214214
215215
- name: Build and test
216-
if: matrix.os != 'windows-2019'
216+
if: matrix.os != 'windows-2022'
217217
run: |
218218
ctest -j 2 -VV -S dashboard.cmake
219219
220220
- name: Build and test
221-
if: matrix.os == 'windows-2019'
221+
if: matrix.os == 'windows-2022'
222222
run: |
223-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
223+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
224224
ctest -j 2 -VV -S dashboard.cmake
225225
shell: cmd
226226

@@ -229,20 +229,20 @@ jobs:
229229
strategy:
230230
max-parallel: 3
231231
matrix:
232-
os: [ubuntu-20.04, windows-2019, macos-11]
232+
os: [ubuntu-22.04, windows-2022, macos-12]
233233

234234
steps:
235-
- uses: actions/checkout@v1
236-
- name: Set up Python 3.7
237-
uses: actions/setup-python@v1
235+
- uses: actions/checkout@v3
236+
- name: Set up Python 3.9
237+
uses: actions/setup-python@v3
238238
with:
239-
python-version: 3.7
239+
python-version: 3.9
240240

241241
- name: Install build dependencies
242242
run: |
243243
python -m pip install --upgrade pip
244244
python -m pip install ninja
245-
python -m pip install itk>=5.2.0.post2
245+
python -m pip install itk>=5.3.0
246246
python -m pip install matplotlib
247247
python -m pip install itkwidgets
248248
@@ -254,23 +254,23 @@ jobs:
254254
strategy:
255255
max-parallel: 3
256256
matrix:
257-
os: [ubuntu-20.04]
257+
os: [ubuntu-22.04]
258258
include:
259-
- os: ubuntu-20.04
259+
- os: ubuntu-22.04
260260
c-compiler: "gcc"
261261
cxx-compiler: "g++"
262262
cmake-build-type: "Release"
263263

264264
steps:
265-
- uses: actions/checkout@v2
265+
- uses: actions/checkout@v3
266266
with:
267267
path: Ex
268268
submodules: recursive
269269

270-
- name: Set up Python 3.8
271-
uses: actions/setup-python@v1
270+
- name: Set up Python 3.9
271+
uses: actions/setup-python@v3
272272
with:
273-
python-version: 3.8
273+
python-version: 3.9
274274

275275
- name: Get specific version of CMake, Ninja
276276
uses: lukka/get-cmake@v3.19.2

‎src/Core/Transform/MutualInformationAffine/MutualInformationAffine.ipynb

Lines changed: 1046 additions & 862 deletions
Large diffs are not rendered by default.

‎src/Numerics/Optimizers/ExhaustiveOptimizer/PlotExhaustiveOptimizer.ipynb

Lines changed: 152 additions & 50 deletions
Large diffs are not rendered by default.

‎src/Registration/Common/MutualInformation/MutualInformation.ipynb

Lines changed: 298 additions & 116 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)