Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add m1 matrix #82

Draft
wants to merge 14 commits into
base: master
Choose a base branch
from
5 changes: 5 additions & 0 deletions .github/workflows/nightlies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,8 @@ jobs:
triple: armv7l-linux-musleabihf
- os: macosx
triple: x86_64-apple-darwin14
- os: macosx_arm64
triple: arm64-apple
- os: windows
triple: x86_64-w64-mingw32
- os: windows
Expand All @@ -341,6 +343,9 @@ jobs:
- target:
os: windows
builder: windows-2019
- target:
os: macosx_arm64
builder: macos-14

env: ${{ matrix.setting.environment }}
name: '${{ matrix.target.triple }} (${{ matrix.setting.branch }}, ${{ matrix.setting.commit }})'
Expand Down
5 changes: 5 additions & 0 deletions bw-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,10 @@ fi
mkdir -p "$output" || exit 1
cd "$output" || exit 1

if [[ $triple == "arm64-apple" ]]; then
exit 0
fi

for pkg in "$@"; do
asset=$(getAsset "$pkg") || exit 1
case "$(jq 'length' <<< "$asset")" in
Expand All @@ -166,6 +170,7 @@ for pkg in "$@"; do
0)
echo "Package $pkg not found for triple: $triple"
exit 1

;;
*)
echo "Ambiguous triple '$triple'" >&2
Expand Down
6 changes: 5 additions & 1 deletion deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,11 @@ case "$(os)" in
# Starting from musl 1.2.0, time_t is 64 bit on all arches
echo "-d:nimUse64BitCTime" >> nim.cfg
else
libdir=$(realpath lib)
if [[ $triple == "arm64-apple" ]]; then
libdir="/opt/homebrew/lib"
else
libdir=$(realpath lib)
fi
cflags+=(-target "$triple")
fi
libs+=(libssl.a libcrypto.a libpcre.a libsqlite3.a)
Expand Down
Loading