Skip to content

Commit cc26f0d

Browse files
hebastohebasto
committed
ci: Run "macOS native x86_64" job on GitHub Actions
Also, the "macOS native arm64" task has been removed from Cirrus CI.
1 parent d096743 commit cc26f0d

File tree

3 files changed

+54
-20
lines changed

3 files changed

+54
-20
lines changed

‎.cirrus.yml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -334,20 +334,3 @@ task:
334334
env:
335335
MACOS_SDK: "Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers"
336336
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
337-
338-
task:
339-
name: 'macOS 13 native arm64 [gui, sqlite only] [no depends]'
340-
macos_instance:
341-
# Use latest image, but hardcode version to avoid silent upgrades (and breaks)
342-
image: ghcr.io/cirruslabs/macos-ventura-xcode:14.3.1 # https://cirrus-ci.org/guide/macOS
343-
<< : *BASE_TEMPLATE
344-
check_clang_script:
345-
- clang --version
346-
brew_install_script:
347-
- brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt
348-
<< : *MAIN_TEMPLATE
349-
env:
350-
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
351-
CI_USE_APT_INSTALL: "no"
352-
PACKAGE_MANAGER_INSTALL: "echo" # Nothing to do
353-
FILE_ENV: "./ci/test/00_setup_env_mac_native_arm64.sh"

‎.github/workflows/ci.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Copyright (c) 2023 The Bitcoin Core developers
2+
# Distributed under the MIT software license, see the accompanying
3+
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
4+
5+
name: bitcoin-core-ci
6+
run-name: Bitcoin Core CI
7+
# See: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onpushpull_requestpull_request_targetpathspaths-ignore.
8+
on: [pull_request, push]
9+
10+
env:
11+
DANGER_RUN_CI_ON_HOST: 1
12+
TEST_RUNNER_TIMEOUT_FACTOR: 40
13+
14+
jobs:
15+
macos-native-x86_64:
16+
name: macOS 13 native, x86_64 [no depends, sqlite only, gui]
17+
# Use latest image, but hardcode version to avoid silent upgrades (and breaks).
18+
# See: https://github.com/actions/runner-images#available-images.
19+
runs-on: macos-13
20+
21+
# No need to run on the read-only mirror, unless it is a PR.
22+
if: github.repository != 'bitcoin-core/gui' || github.event_name == 'pull_request'
23+
24+
env:
25+
MAKEJOBS: '-j4'
26+
CI_USE_APT_INSTALL: 'no'
27+
PACKAGE_MANAGER_INSTALL: 'echo' # Nothing to do
28+
FILE_ENV: './ci/test/00_setup_env_mac_native.sh'
29+
30+
steps:
31+
- name: Checkout
32+
uses: actions/checkout@v3
33+
34+
- name: Clang version
35+
run: clang --version
36+
37+
- name: Install Homebrew packages
38+
run: brew install automake boost pkg-config miniupnpc libnatpmp zeromq qt@5 qrencode ccache gnu-getopt
39+
40+
- name: Set Ccache directory
41+
run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV"
42+
43+
- name: Ccache cache
44+
uses: actions/cache@v3
45+
with:
46+
path: ${{ env.CCACHE_DIR }}
47+
key: ${{ github.job }}-ccache-cache-${{ github.run_id }}
48+
restore-keys: ${{ github.job }}-ccache-cache
49+
50+
- name: CI script
51+
run: ./ci/test_run_all.sh

ci/test/00_setup_env_mac_native_arm64.sh renamed to ci/test/00_setup_env_mac_native.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright (c) 2019-2022 The Bitcoin Core developers
3+
# Copyright (c) 2023 The Bitcoin Core developers
44
# Distributed under the MIT software license, see the accompanying
55
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
66

77
export LC_ALL=C.UTF-8
88

9-
export HOST=arm64-apple-darwin
9+
export HOST=x86_64-apple-darwin
1010
export PIP_PACKAGES="zmq"
1111
export GOAL="install"
1212
export BITCOIN_CONFIG="--with-gui --with-miniupnpc --with-natpmp --enable-reduce-exports"
1313
export CI_OS_NAME="macos"
1414
export NO_DEPENDS=1
1515
export OSX_SDK=""
16-
export CCACHE_MAXSIZE=300M
16+
export CCACHE_MAXSIZE=400M
1717
export RUN_FUZZ_TESTS=true
1818
export FUZZ_TESTS_CONFIG="--exclude banman" # https://github.com/bitcoin/bitcoin/issues/27924

0 commit comments

Comments
 (0)