From 162901b617f84034ceafa075b086284e28ed9a75 Mon Sep 17 00:00:00 2001 From: div72 Date: Mon, 16 Sep 2024 14:16:57 +0300 Subject: [PATCH] cd: add MacOS arm64 cross job --- .github/workflows/cd.yml | 2 +- cd/00_setup_env_mac_arm64_cross.sh | 15 +++++++++++++++ cd/06_script_b.sh | 6 +++++- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100755 cd/00_setup_env_mac_arm64_cross.sh diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 09c246137c..fdd038a64c 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - script-id: [win32, win64, mac] + script-id: [win32, win64, mac, mac_arm64_cross] env: FILE_ENV: ./cd/00_setup_env_${{ matrix.script-id }}.sh OS_NAME: linux diff --git a/cd/00_setup_env_mac_arm64_cross.sh b/cd/00_setup_env_mac_arm64_cross.sh new file mode 100755 index 0000000000..0b7a44408b --- /dev/null +++ b/cd/00_setup_env_mac_arm64_cross.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +# +# Copyright (c) 2019-2020 The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or https://opensource.org/licenses/mit-license.php. + +export LC_ALL=C.UTF-8 + +export CONTAINER_NAME=cd_macos_arm64_cross +export DOCKER_NAME_TAG=ubuntu:24.04 +export HOST=arm64-apple-darwin +export PACKAGES="clang lld llvm cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev python3-setuptools xorriso" +export XCODE_VERSION=15.0 +export XCODE_BUILD_ID=15A240d +export GRIDCOIN_CONFIG="--with-gui --enable-reduce-exports" diff --git a/cd/06_script_b.sh b/cd/06_script_b.sh index 75e39be007..dfc1839172 100755 --- a/cd/06_script_b.sh +++ b/cd/06_script_b.sh @@ -12,7 +12,11 @@ if [[ $HOST = *-apple-* ]]; then KV=$(cat $BASE_ROOT_DIR/depends/hosts/darwin.mk | grep "OSX_MIN_VERSION=") VER=${KV#OSX_MIN_VERSION=} for f in /tmp/release/*.dmg; do - mv $f ${f%.dmg}-min-$VER.dmg + if [[ $HOST = x86_64-* ]]; then + mv $f ${f%.dmg}-min-$VER.dmg + else + mv $f ${f%.dmg}_arm64-min-$VER.dmg + fi done fi