Skip to content

Commit 72383b4

Browse files
committed
macOS 13 -> 14/15
GH runners EOL and removed
1 parent c21a835 commit 72383b4

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ jobs:
4040
CMAKE_GENERATOR: "Visual Studio 17 2022"
4141
CMAKE_GENERATOR_PLATFORM: "Win32"
4242

43-
- os: macos-13
43+
- os: macos-15-intel
4444
arch: "x86_64"
4545
env:
4646
MACOSX_DEPLOYMENT_TARGET: 11.0
4747

4848
# Apple Silicon M1/arm64/aarch64 builds:
4949
# https://cibuildwheel.readthedocs.io/en/stable/faq/#apple-silicon
5050
# https://github.com/pypa/cibuildwheel/pull/704
51-
- os: macos-13
51+
- os: macos-14
5252
arch: "arm64"
5353
env:
5454
CMAKE_OSX_ARCHITECTURES: "arm64"
@@ -60,7 +60,7 @@ jobs:
6060
# https://developer.apple.com/documentation/apple-silicon/building-a-universal-macos-binary
6161
# ADIOS1 tricky to build and HDF5 even with CMake as well (as of 1.12)
6262
# We could build them twice and use `lipo` to combine the lib artifacts.
63-
#- os: macos-13
63+
#- os: macos-15-intel
6464
# arch: "universal2"
6565
# env:
6666
# CMAKE_OSX_ARCHITECTURES: "arm64;x86_64"

library_builders.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ BUILD_PREFIX="${BUILD_PREFIX:-/usr/local}"
99
if [ "$(uname -s)" = "Darwin" ]
1010
then
1111
CPU_COUNT="${CPU_COUNT:-3}"
12+
SUDO="sudo"
1213
else
1314
CPU_COUNT="${CPU_COUNT:-2}"
15+
SUDO=""
1416
fi
1517

1618
function install_buildessentials {
@@ -112,7 +114,7 @@ function build_adios2 {
112114
-DCMAKE_INSTALL_PREFIX=${BUILD_PREFIX} ../ADIOS2-*
113115

114116
make -j${CPU_COUNT}
115-
make install
117+
${SUDO} make install
116118

117119
# CMake Config package of C-Blosc 2.10.1+ only
118120
# https://github.com/ornladios/ADIOS2/issues/3903
@@ -163,7 +165,7 @@ function build_blosc2 {
163165
"${architecture_specific_flags[@]}" \
164166
../c-blosc2-*
165167
make -j${CPU_COUNT}
166-
make install
168+
${SUDO} make install
167169
cd -
168170

169171
rm -rf build-blosc2
@@ -192,7 +194,7 @@ function build_zfp {
192194
-DCMAKE_INSTALL_PREFIX=${BUILD_PREFIX} \
193195
../zfp-*
194196
make -j${CPU_COUNT}
195-
make install
197+
${SUDO} make install
196198
cd -
197199

198200
rm -rf build-zfp
@@ -220,7 +222,7 @@ function build_zlib {
220222
-DCMAKE_INSTALL_PREFIX=${BUILD_PREFIX}
221223

222224
PATH=${CMAKE_BIN}:${PATH} cmake --build build-zlib --parallel ${CPU_COUNT}
223-
PATH=${CMAKE_BIN}:${PATH} cmake --build build-zlib --target install
225+
PATH=${CMAKE_BIN}:${PATH} ${SUDO} cmake --build build-zlib --target install
224226
rm -rf ${BUILD_PREFIX}/lib/libz.*dylib ${BUILD_PREFIX}/lib/libz.*so
225227

226228
rm -rf build-zlib
@@ -292,7 +294,7 @@ function build_hdf5 {
292294
fi
293295

294296
make -j${CPU_COUNT}
295-
make install
297+
${SUDO} make install
296298
cd ..
297299

298300
touch hdf5-stamp

0 commit comments

Comments
 (0)