diff options
| author | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-01-12 13:13:55 +0100 |
|---|---|---|
| committer | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-01-12 13:14:04 +0100 |
| commit | 5148145b3597cd6f99e68d0bdb9dae6705a3b9b6 (patch) | |
| tree | a55fb38e956907c563fb38dbeee76666ae60015f /.cirrus.yml | |
| parent | 0da38b6b0e74ee4479553d2bf611593fa51d54b3 (diff) | |
| parent | 95ec9604a443e2182d9c0eeba36293d57b37e1f9 (diff) | |
| download | bitcoin-5148145b3597cd6f99e68d0bdb9dae6705a3b9b6.tar.xz | |
Merge bitcoin/bitcoin#26880: [24.x] ci: replace Intel macOS CI job
95ec9604a443e2182d9c0eeba36293d57b37e1f9 ci: Use `macos-ventura-xcode:14.1` image for "macOS native" task (Hennadii Stepanov)
50ad39d9d049d99ecce8a41553e0578950617265 ci: Make `getopt` path architecture agnostic (Hennadii Stepanov)
ce2a072ba846cc497b9823c6359e7230a268e137 ci: Allow PIP_PACKAGES on centos (MacroFake)
644c0304f56171ef2bac595ab67344f45733e169 ci: Remove unused package (MacroFake)
Pull request description:
ACKs for top commit:
fanquake:
ACK 95ec9604a443e2182d9c0eeba36293d57b37e1f9 did the same for 23.x & in #26878.
Tree-SHA512: 086fbe2f2a39e210cc41076d42fb911abdd720a2824fcaaacfaf50345c90d23b9f9f8b0a06e4f85cced0a8fdf0e5f5a7a3a00a05edbc267574893975dfc7c061
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index c8ccf6c057..fdecfc1eb6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -312,16 +312,16 @@ task: FILE_ENV: "./ci/test/00_setup_env_mac.sh" task: - name: 'macOS 12 native x86_64 [gui, system sqlite] [no depends]' + name: 'macOS 13 native arm64 [gui, sqlite only] [no depends]' macos_instance: # Use latest image, but hardcode version to avoid silent upgrades (and breaks) - image: monterey-xcode-13.3 # https://cirrus-ci.org/guide/macOS + image: ghcr.io/cirruslabs/macos-ventura-xcode:14.1 # https://cirrus-ci.org/guide/macOS << : *MACOS_NATIVE_TASK_TEMPLATE env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV CI_USE_APT_INSTALL: "no" PACKAGE_MANAGER_INSTALL: "echo" # Nothing to do - FILE_ENV: "./ci/test/00_setup_env_mac_native_x86_64.sh" + FILE_ENV: "./ci/test/00_setup_env_mac_native_arm64.sh" task: name: 'ARM64 Android APK [focal]' |