Skip to content

Commit 2c86f7a

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

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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"/ ..

0 commit comments

Comments
 (0)