Merge 1b12e384a2 into 5bf0409eba

.gitlab-ci.yml

@@ -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"
@@ -222,7 +222,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
@@ -328,6 +333,7 @@ linux64_multiprocess-build:
 #  variables:
 #    BUILD_TARGET: linux64_valgrind
 
+
 mac-build:
   extends:
     - .build-template
@@ -336,6 +342,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
 
 ###
 

ci/dash/matrix.sh

@@ -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
 elif [ "$BUILD_TARGET" = "win64" ]; then

ci/test/00_setup_env_arm_mac.sh

@@ -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"

ci/test/00_setup_env_arm_mac_host.sh

@@ -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=""