Skip to content

Commit

Permalink
ci: add aarch64 macos builds to ci
Browse files Browse the repository at this point in the history
  • Loading branch information
PastaPastaPasta committed Nov 3, 2024
1 parent 396573d commit 1b12e38
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 2 deletions.
18 changes: 16 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ builder-image:
before_script:
- echo HOST=$HOST
- |
if [ "$HOST" = "x86_64-apple-darwin" ]; then
if [ "$HOST" = "x86_64-apple-darwin" || "$HOST" = "aarch64-apple-darwin" ]; then
mkdir -p depends/SDKs
mkdir -p depends/sdk-sources
OSX_SDK_BASENAME="Xcode-${XCODE_VERSION}-${XCODE_BUILD_ID}-extracted-SDK-with-libcxx-headers.tar.gz"
Expand Down Expand Up @@ -218,7 +218,12 @@ x86_64-apple-darwin:
variables:
HOST: x86_64-apple-darwin

###
aarch64-apple-darwin:
extends:
- .build-depends-template
- .skip-in-fast-mode-template
variables:
HOST: aarch64-apple-darwin

arm-linux-build:
extends: .build-template
Expand Down Expand Up @@ -324,6 +329,7 @@ linux64_multiprocess-build:
# variables:
# BUILD_TARGET: linux64_valgrind


mac-build:
extends:
- .build-template
Expand All @@ -332,6 +338,14 @@ mac-build:
- x86_64-apple-darwin
variables:
BUILD_TARGET: mac
arm-mac-build:
extends:
- .build-template
- .skip-in-fast-mode-template
needs:
- aarch64-apple-darwin
variables:
BUILD_TARGET: arm-mac

###

Expand Down
2 changes: 2 additions & 0 deletions ci/dash/matrix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ elif [ "$BUILD_TARGET" = "linux64_valgrind" ]; then
source ./ci/test/00_setup_env_native_valgrind.sh
elif [ "$BUILD_TARGET" = "mac" ]; then
source ./ci/test/00_setup_env_mac.sh
elif [ "$BUILD_TARGET" = "arm-mac" ]; then
source ./ci/test/00_setup_env_mac.sh
elif [ "$BUILD_TARGET" = "s390x" ]; then
source ./ci/test/00_setup_env_s390x.sh
fi
17 changes: 17 additions & 0 deletions ci/test/00_setup_env_arm_mac.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/env bash
#
# Copyright (c) 2019-2020 The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.

export LC_ALL=C.UTF-8

export CONTAINER_NAME=ci_arm-macos_cross
export HOST=aarch64-apple-darwin
export PACKAGES="cmake libcap-dev libz-dev libbz2-dev python3-dev python3-setuptools"
export XCODE_VERSION=12.2
export XCODE_BUILD_ID=12B45b
export RUN_UNIT_TESTS=false
export RUN_INTEGRATION_TESTS=false
export GOAL="all deploy"
export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner --enable-werror"
19 changes: 19 additions & 0 deletions ci/test/00_setup_env_arm_mac_host.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/usr/bin/env bash
#
# Copyright (c) 2019-2020 The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.

export LC_ALL=C.UTF-8

export CONTAINER_NAME=ci_arm-macos
export HOST=aarch64-apple-darwin
export PIP_PACKAGES="zmq lief"
export RUN_UNIT_TESTS=true
export RUN_INTEGRATION_TESTS=false
export RUN_SECURITY_TESTS="true"
export GOAL="install"
export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner --enable-werror"
# Run without depends
export NO_DEPENDS=1
export OSX_SDK=""

0 comments on commit 1b12e38

Please sign in to comment.