Skip to content

Commit f1d71c9

Browse files
author
Vasu Jaganath
committed
migrate mac intel to supported 15
1 parent 78dc0a7 commit f1d71c9

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

.github/workflows/build_and_test_mac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
jobs:
1717
Build_and_Run_GTest:
1818
name: Build and Run GoogleTest
19-
runs-on: macos-14-large
19+
runs-on: macos-15-intel
2020
defaults:
2121
run:
2222
shell: bash -el {0}
@@ -58,7 +58,7 @@ jobs:
5858

5959
Build_and_Run_PyTest:
6060
name: Build and Run PyTest
61-
runs-on: macos-14-large
61+
runs-on: macos-15-intel
6262
defaults:
6363
run:
6464
shell: bash -el {0}

.github/workflows/build_wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
MACOSX_DEPLOYMENT_TARGET: "10.15"
1919
strategy:
2020
matrix:
21-
os: [ubuntu-22.04, windows-latest, macos-14-large, ubuntu-22.04-arm]
21+
os: [ubuntu-22.04, windows-latest, macos-15-intel, ubuntu-22.04-arm]
2222
cibw_archs: ["auto64"]
2323
cibw_build: ["cp310", "cp311", "cp312", "cp313"]
2424

ci-utils/install_prereq_linux.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_IN
5656
make install -j4
5757
cd ../../
5858

59-
curl -L https://github.com/madler/zlib/releases/download/v1.3/zlib13.zip -o zlib13.zip
60-
unzip zlib13.zip
61-
cd zlib-1.3
59+
curl -L https://github.com/madler/zlib/releases/download/v1.3.1/zlib131.zip -o zlib131.zip
60+
unzip zlib131.zip
61+
cd zlib-1.3.1
6262
mkdir build_man
6363
cd build_man
6464
cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/ ..
@@ -83,9 +83,9 @@ if [[ $BUILD_BOOST_DEP -eq 1 ]]; then
8383
fi
8484

8585
if [[ $BUILD_Z5_DEP -eq 1 ]]; then
86-
curl -L https://github.com/Blosc/c-blosc/archive/refs/tags/v1.21.5.zip -o v1.21.5.zip
87-
unzip v1.21.5.zip
88-
cd c-blosc-1.21.5
86+
curl -L https://github.com/Blosc/c-blosc/archive/refs/tags/v1.21.6.zip -o v1.21.6.zip
87+
unzip v1.21.6.zip
88+
cd c-blosc-1.21.6
8989
mkdir build_man
9090
cd build_man
9191
cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/ ..
@@ -153,9 +153,9 @@ make install -j4
153153
cd ../../
154154

155155
if [[ $BULD_DCMTK_DEP -eq 1 ]]; then
156-
curl -L https://github.com/glennrp/libpng/archive/refs/tags/v1.6.39.zip -o v1.6.39.zip
157-
unzip v1.6.39.zip
158-
cd libpng-1.6.39
156+
curl -L https://github.com/glennrp/libpng/archive/refs/tags/v1.6.53.zip -o v1.6.53.zip
157+
unzip v1.6.53.zip
158+
cd libpng-1.6.53
159159
mkdir build_man
160160
cd build_man
161161
cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/ -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/ ..

ci-utils/install_prereq_win.bat

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ cmake --build . --config Release --target install
3030
popd
3131
popd
3232

33-
curl -L https://github.com/madler/zlib/releases/download/v1.3/zlib13.zip -o zlib13.zip
34-
tar -xvf zlib13.zip
35-
pushd zlib-1.3
33+
curl -L https://github.com/madler/zlib/releases/download/v1.3.1/zlib131.zip -o zlib131.zip
34+
tar -xvf zlib131.zip
35+
pushd zlib-1.3.1
3636
mkdir build_man
3737
pushd build_man
3838
cmake -DCMAKE_INSTALL_PREFIX=../../local_install/ ..
@@ -56,9 +56,9 @@ if "%BUILD_Z5_DEP%" == "1" (
5656
xcopy /E /I /y boost ..\local_install\include\boost
5757
popd
5858

59-
curl -L https://github.com/Blosc/c-blosc/archive/refs/tags/v1.21.5.zip -o v1.21.5.zip
60-
tar -xf v1.21.5.zip
61-
pushd c-blosc-1.21.5
59+
curl -L https://github.com/Blosc/c-blosc/archive/refs/tags/v1.21.6.zip -o v1.21.6.zip
60+
tar -xf v1.21.6.zip
61+
pushd c-blosc-1.21.6
6262
mkdir build_man
6363
pushd build_man
6464
cmake -DCMAKE_INSTALL_PREFIX=../../local_install/ ..

0 commit comments

Comments
 (0)