ci/cirrus-ci-macos: Update to the latest macOS version
The big-sur-base image has been decomissioned by Cirrus-CI, so
we have to update to a newer version of macOS now.
Message-Id: <20230104142511.297077-1-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
diff --git a/ci/cirrus-ci-macos-i386.yml b/ci/cirrus-ci-macos-i386.yml
index ef0861e..ed580e6 100644
--- a/ci/cirrus-ci-macos-i386.yml
+++ b/ci/cirrus-ci-macos-i386.yml
@@ -1,7 +1,7 @@
macos_i386_task:
osx_instance:
- image: big-sur-base
+ image: ghcr.io/cirruslabs/macos-ventura-base:latest
install_script:
- brew update
- brew install coreutils bash git gnu-getopt make qemu i686-elf-gcc
@@ -10,7 +10,7 @@
- git fetch origin "@CI_COMMIT_REF_NAME@"
- git reset --hard "@CI_COMMIT_SHA@"
script:
- - export PATH="/usr/local/opt/gnu-getopt/bin:$PATH"
+ - export PATH="/opt/homebrew/opt/gnu-getopt/bin:$PATH"
- mkdir build
- cd build
- ../configure --arch=i386 --cross-prefix=i686-elf-
diff --git a/ci/cirrus-ci-macos-x86-64.yml b/ci/cirrus-ci-macos-x86-64.yml
index 676646f..861caa1 100644
--- a/ci/cirrus-ci-macos-x86-64.yml
+++ b/ci/cirrus-ci-macos-x86-64.yml
@@ -1,7 +1,7 @@
macos_task:
osx_instance:
- image: big-sur-base
+ image: ghcr.io/cirruslabs/macos-ventura-base:latest
install_script:
- brew update
- brew install coreutils bash git gnu-getopt make qemu x86_64-elf-gcc
@@ -10,10 +10,10 @@
- git fetch origin "@CI_COMMIT_REF_NAME@"
- git reset --hard "@CI_COMMIT_SHA@"
script:
- - export PATH="/usr/local/opt/gnu-getopt/bin:$PATH"
+ - export PATH="/opt/homebrew/opt/gnu-getopt/bin:$PATH"
- mkdir build
- cd build
- - ../configure --cross-prefix=x86_64-elf-
+ - ../configure --arch=x86_64 --cross-prefix=x86_64-elf-
- gmake -j$(sysctl -n hw.ncpu)
- ACCEL=tcg ./run_tests.sh
eventinj
