Skip to content

Commit 9658d0d

Browse files
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 9658d0d

File tree

3 files changed

+62
-20
lines changed

3 files changed

+62
-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: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
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: CI
6+
on:
7+
# See: https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request.
8+
pull_request:
9+
# See: https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#push.
10+
push:
11+
branches:
12+
- '**'
13+
tags-ignore:
14+
- '**'
15+
16+
env:
17+
DANGER_RUN_CI_ON_HOST: 1
18+
TEST_RUNNER_TIMEOUT_FACTOR: 40
19+
20+
jobs:
21+
macos-native-x86_64:
22+
name: macOS 13 native, x86_64 [no depends, sqlite only, gui]
23+
# Use latest image, but hardcode version to avoid silent upgrades (and breaks).
24+
# See: https://github.com/actions/runner-images#available-images.
25+
runs-on: macos-13
26+
27+
# No need to run on the read-only mirror, unless it is a PR.
28+
if: github.repository != 'bitcoin-core/gui' || github.event_name == 'pull_request'
29+
30+
timeout-minutes: 120
31+
32+
env:
33+
MAKEJOBS: '-j4'
34+
CI_USE_APT_INSTALL: 'no'
35+
PACKAGE_MANAGER_INSTALL: 'echo' # Nothing to do
36+
FILE_ENV: './ci/test/00_setup_env_mac_native.sh'
37+
38+
steps:
39+
- name: Checkout
40+
uses: actions/checkout@v3
41+
42+
- name: Clang version
43+
run: clang --version
44+
45+
- name: Install Homebrew packages
46+
run: brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt
47+
48+
- name: Set Ccache directory
49+
run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV"
50+
51+
- name: Ccache cache
52+
uses: actions/cache@v3
53+
with:
54+
path: ${{ env.CCACHE_DIR }}
55+
key: ${{ github.job }}-ccache-cache-${{ github.run_id }}
56+
restore-keys: ${{ github.job }}-ccache-cache
57+
58+
- name: CI script
59+
run: ./ci/test_run_all.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) 2019-present 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)