Merge bitcoin/bitcoin#33549: ci: Add macOS cross task for arm64-apple-darwin
fad5a7101cci: Add macOS cross task for arm64 (MarcoFalke)fa8c750a0aci: Refactor get_previous_releases step in win-test-cross task (MarcoFalke) Pull request description: Cross compiling to Intel macOS seems fine, but it would be good to cross compile to arm64-apple-darwin as well. Further reading: * https://en.wikipedia.org/wiki/Mac_transition_to_Apple_silicon#Timeline. * It is harder to find native Intel macOS hardware (E.g. GitHub is in the process of dropping it: https://github.blog/changelog/2025-07-11-upcoming-changes-to-macos-hosted-runners-macos-latest-migration-and-xcode-support-policy-updates/#macos-13-is-closing-down) ACKs for top commit: Sjors: utACKfad5a7101chodlinator: crACKfad5a7101cTree-SHA512: ce96ac9f68f594584dc910555bd34590084e3e45ca02a22d4949e88bb569de3bf87ebf6b5c6718ae82d7750a98212b72f6dab80bddfc9652a57180fbdda97f42
This commit is contained in:
4 files changed
+30
-5
No files matched your search
@@ -432,8 +432,7 @@ jobs:
|
|||||||
echo "PREVIOUS_RELEASES_DIR=${{ runner.temp }}/previous_releases" >> "$GITHUB_ENV"
|
echo "PREVIOUS_RELEASES_DIR=${{ runner.temp }}/previous_releases" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
- name: Get previous releases
|
- name: Get previous releases
|
||||||
working-directory: test
|
run: ./test/get_previous_releases.py --target-dir $PREVIOUS_RELEASES_DIR
|
||||||
run: ./get_previous_releases.py --target-dir $PREVIOUS_RELEASES_DIR
|
|
||||||
|
|
||||||
- name: Run functional tests
|
- name: Run functional tests
|
||||||
env:
|
env:
|
||||||
@@ -471,12 +470,18 @@ jobs:
|
|||||||
timeout-minutes: 120
|
timeout-minutes: 120
|
||||||
file-env: './ci/test/00_setup_env_native_asan.sh'
|
file-env: './ci/test/00_setup_env_native_asan.sh'
|
||||||
|
|
||||||
- name: 'macOS-cross, gui, no tests'
|
- name: 'macOS-cross to arm64'
|
||||||
cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-sm'
|
cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-sm'
|
||||||
fallback-runner: 'ubuntu-24.04'
|
fallback-runner: 'ubuntu-24.04'
|
||||||
timeout-minutes: 120
|
timeout-minutes: 120
|
||||||
file-env: './ci/test/00_setup_env_mac_cross.sh'
|
file-env: './ci/test/00_setup_env_mac_cross.sh'
|
||||||
|
|
||||||
|
- name: 'macOS-cross to x86_64'
|
||||||
|
cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-sm'
|
||||||
|
fallback-runner: 'ubuntu-24.04'
|
||||||
|
timeout-minutes: 120
|
||||||
|
file-env: './ci/test/00_setup_env_mac_cross_intel.sh'
|
||||||
|
|
||||||
- name: 'No wallet, libbitcoinkernel'
|
- name: 'No wallet, libbitcoinkernel'
|
||||||
cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-sm'
|
cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-sm'
|
||||||
fallback-runner: 'ubuntu-24.04'
|
fallback-runner: 'ubuntu-24.04'
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
|
|||||||
|
|
||||||
export CONTAINER_NAME=ci_macos_cross
|
export CONTAINER_NAME=ci_macos_cross
|
||||||
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
|
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
|
||||||
export HOST=x86_64-apple-darwin
|
export HOST=arm64-apple-darwin
|
||||||
export PACKAGES="clang lld llvm zip"
|
export PACKAGES="clang lld llvm zip"
|
||||||
export XCODE_VERSION=15.0
|
export XCODE_VERSION=15.0
|
||||||
export XCODE_BUILD_ID=15A240d
|
export XCODE_BUILD_ID=15A240d
|
||||||
|
|||||||
Executable
+20
@@ -0,0 +1,20 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
#
|
||||||
|
# Copyright (c) 2019-present 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 SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
|
||||||
|
|
||||||
|
export CONTAINER_NAME=ci_macos_cross_intel
|
||||||
|
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
|
||||||
|
export HOST=x86_64-apple-darwin
|
||||||
|
export PACKAGES="clang lld llvm zip"
|
||||||
|
export XCODE_VERSION=15.0
|
||||||
|
export XCODE_BUILD_ID=15A240d
|
||||||
|
export RUN_UNIT_TESTS=false
|
||||||
|
export RUN_FUNCTIONAL_TESTS=false
|
||||||
|
export GOAL="deploy"
|
||||||
|
export BITCOIN_CONFIG="-DBUILD_GUI=ON -DREDUCE_EXPORTS=ON"
|
||||||
+1
-1
@@ -123,7 +123,7 @@ Common `host-platform-triplet`s for cross compilation are:
|
|||||||
- `i686-pc-linux-gnu` for Linux x86 32 bit
|
- `i686-pc-linux-gnu` for Linux x86 32 bit
|
||||||
- `x86_64-pc-linux-gnu` for Linux x86 64 bit
|
- `x86_64-pc-linux-gnu` for Linux x86 64 bit
|
||||||
- `x86_64-w64-mingw32` for Win64
|
- `x86_64-w64-mingw32` for Win64
|
||||||
- `x86_64-apple-darwin` for macOS
|
- `x86_64-apple-darwin` for Intel macOS
|
||||||
- `arm64-apple-darwin` for ARM macOS
|
- `arm64-apple-darwin` for ARM macOS
|
||||||
- `arm-linux-gnueabihf` for Linux ARM 32 bit
|
- `arm-linux-gnueabihf` for Linux ARM 32 bit
|
||||||
- `aarch64-linux-gnu` for Linux ARM 64 bit
|
- `aarch64-linux-gnu` for Linux ARM 64 bit
|
||||||
|
|||||||
Reference in new issue
Block a user