Skip to content

Commit d2be24f

Browse files
sipaFabcien
authored andcommitted
[secp256k1] Update macOS image for CI
Summary: Backport of [[bitcoin-core/secp256k1#1152 | secp256k1#1152]]: bitcoin-core/secp256k1@c0ae48c The second commit is not applicable. Depends on D12960. This will unbreak the build on Cirrus CI, following the MacOS Intel deprecation: https://cirrus-ci.org/blog/2022/11/08/sunsetting-intel-macos-instances/ Test Plan: See the CI result all green on my forked repo: https://cirrus-ci.com/build/5534806579085312 Reviewers: #bitcoin_abc, sdulfari Reviewed By: #bitcoin_abc, sdulfari Differential Revision: https://reviews.bitcoinabc.org/D12961
1 parent 826d64f commit d2be24f

File tree

1 file changed

+10
-42
lines changed

1 file changed

+10
-42
lines changed

.cirrus.yml

Lines changed: 10 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -92,59 +92,27 @@ task:
9292

9393
task:
9494
timeout_in: 120m
95-
name: "x86_64: macOS Catalina"
95+
name: "arm64: macOS Ventura"
9696
macos_instance:
97-
image: catalina-base
97+
image: ghcr.io/cirruslabs/macos-ventura-base:latest
9898
env:
9999
HOMEBREW_NO_AUTO_UPDATE: 1
100100
HOMEBREW_NO_INSTALL_CLEANUP: 1
101-
# Cirrus gives us a fixed number of 12 virtual CPUs. Not that we even have that many jobs at the moment...
102-
MAKEFLAGS: -j13
101+
# Cirrus gives us a fixed number of 4 virtual CPUs. Not that we even have that many jobs at the moment...
102+
MAKEFLAGS: -j5
103103
matrix:
104104
<< : *ENV_MATRIX
105+
env:
106+
ASM: no
107+
WITH_VALGRIND: no
108+
CTIMETEST: no
105109
matrix:
106110
- env:
107-
CC: gcc-9
111+
CC: gcc
108112
- env:
109113
CC: clang
110-
# Update Command Line Tools
111-
# Uncomment this if the Command Line Tools on the CirrusCI macOS image are too old to brew valgrind.
112-
# See https://apple.stackexchange.com/a/195963 for the implementation.
113-
## update_clt_script:
114-
## - system_profiler SPSoftwareDataType
115-
## - touch /tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress
116-
## - |-
117-
## PROD=$(softwareupdate -l | grep "*.*Command Line" | tail -n 1 | awk -F"*" '{print $2}' | sed -e 's/^ *//' | sed 's/Label: //g' | tr -d '\n')
118-
## # For debugging
119-
## - softwareupdate -l && echo "PROD: $PROD"
120-
## - softwareupdate -i "$PROD" --verbose
121-
## - rm /tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress
122-
##
123-
brew_valgrind_pre_script:
124-
- brew config
125-
- brew tap --shallow LouisBrunner/valgrind
126-
# Fetch valgrind source but don't build it yet.
127-
- brew fetch --HEAD LouisBrunner/valgrind/valgrind
128-
brew_valgrind_cache:
129-
# This is $(brew --cellar valgrind) but command substition does not work here.
130-
folder: /usr/local/Cellar/valgrind
131-
# Rebuild cache if ...
132-
fingerprint_script:
133-
# ... macOS version changes:
134-
- sw_vers
135-
# ... brew changes:
136-
- brew config
137-
# ... valgrind changes:
138-
- git -C "$(brew --cache)/valgrind--git" rev-parse HEAD
139-
populate_script:
140-
# If there's no hit in the cache, build and install valgrind.
141-
- brew install --HEAD LouisBrunner/valgrind/valgrind
142-
brew_valgrind_post_script:
143-
# If we have restored valgrind from the cache, tell brew to create symlink to the PATH.
144-
# If we haven't restored from cached (and just run brew install), this is a no-op.
145-
- brew link valgrind
146114
brew_script:
147-
- brew install automake cmake gcc@9 libtool ninja
115+
- brew install automake cmake gcc libtool ninja
148116
test_script:
149117
- ./ci/build_autotools.sh
150118
- ./ci/build_cmake.sh

0 commit comments

Comments
 (0)