Skip to content

Commit a092347

Browse files
committed
Build macos arm64 on the macos-14 agent
1 parent f70fe15 commit a092347

File tree

4 files changed

+9
-22
lines changed

4 files changed

+9
-22
lines changed

.github/build/macos-arm64/build.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ SHARED_PATH="$SCRIPT_PATH/../shared"
66

77
# Compiler settings
88
if [[ "${DEBUG_BUILD}" ]]; then
9-
export FLAGS="-g3 -O0 -fPIC -DDEBUG -arch arm64"
9+
export FLAGS="-g3 -O0 -fPIC -DDEBUG"
1010
export CMAKE_BUILD_TYPE="Debug"
1111
export MESON_BUILD_TYPE="debug"
1212
else
13-
export FLAGS="-O3 -fPIC -DNDEBUG -arch arm64"
13+
export FLAGS="-O3 -fPIC -DNDEBUG"
1414
export CMAKE_BUILD_TYPE="Release"
1515
export MESON_BUILD_TYPE="release"
1616
fi
@@ -22,11 +22,11 @@ export PKG_CONFIG_PATH="$INSTALL_PREFIX/lib/pkgconfig"
2222

2323
# Shared options
2424
export CMAKE_COMMAND="cmake"
25-
export CMAKE_OPTIONS="-DCMAKE_OSX_ARCHITECTURES=arm64"
25+
export CMAKE_OPTIONS=""
2626
export CONFIGURE="./configure"
27-
export CONFIGURE_OPTIONS="--host arm64-apple-macos13"
27+
export CONFIGURE_OPTIONS=""
2828
export MAKE="make -j$(sysctl -n hw.logicalcpu)"
29-
export MESON_OPTIONS="--cross-file=$SCRIPT_PATH/cross-compilation.meson"
29+
export MESON_OPTIONS=""
3030
export SED="gsed"
3131

3232
# Library specific options

.github/build/macos-arm64/cross-compilation.meson

Lines changed: 0 additions & 11 deletions
This file was deleted.

.github/build/macos-arm64/install.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ brew list --formula
77

88
# Uninstall already installed development libraries
99

10-
brew uninstall composer
11-
brew uninstall php
1210
brew uninstall ant
1311
brew uninstall gradle
1412
brew uninstall maven
@@ -66,6 +64,6 @@ fi
6664
# Install build tools
6765
brew install automake libtool gnu-sed nasm ossp-uuid ragel
6866

69-
pip3 install setuptools
70-
pip3 install meson==1.5.1
71-
pip3 install ninja==1.11.1.1
67+
pip3 install --break-system-packages setuptools
68+
pip3 install --break-system-packages meson==1.5.1
69+
pip3 install --break-system-packages ninja==1.11.1.1

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122

123123
build_macos:
124124
name: macOS arm64 static
125-
runs-on: macos-13
125+
runs-on: macos-14
126126

127127
steps:
128128
- uses: actions/checkout@v5

0 commit comments

Comments
 (0)