@@ -92,59 +92,27 @@ task:
92
92
93
93
task :
94
94
timeout_in : 120m
95
- name : " x86_64 : macOS Catalina "
95
+ name : " arm64 : macOS Ventura "
96
96
macos_instance :
97
- image : catalina- base
97
+ image : ghcr.io/cirruslabs/macos-ventura- base:latest
98
98
env :
99
99
HOMEBREW_NO_AUTO_UPDATE : 1
100
100
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
103
103
matrix :
104
104
<< : *ENV_MATRIX
105
+ env :
106
+ ASM : no
107
+ WITH_VALGRIND : no
108
+ CTIMETEST : no
105
109
matrix :
106
110
- env :
107
- CC : gcc-9
111
+ CC : gcc
108
112
- env :
109
113
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
146
114
brew_script :
147
- - brew install automake cmake gcc@9 libtool ninja
115
+ - brew install automake cmake gcc libtool ninja
148
116
test_script :
149
117
- ./ci/build_autotools.sh
150
118
- ./ci/build_cmake.sh
0 commit comments