gitlab supports 3 MacOS images with 15 and 26 being the current supported ones. To get ahead of the curve lets enable 26 as well.
It re-uses the same brew list but also attempts to work around python configure failure by setting DYLD_LIBRARY_PATH: /opt/homebrew/opt/expat/lib/ Signed-off-by: Alex Bennée <[email protected]> --- v2 - call runners directly, seems to be working now - drop debug lines --- .gitlab-ci.d/macos.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.gitlab-ci.d/macos.yml b/.gitlab-ci.d/macos.yml index c93bf12a294..f61750a3f4a 100644 --- a/.gitlab-ci.d/macos.yml +++ b/.gitlab-ci.d/macos.yml @@ -45,3 +45,19 @@ aarch64-macos-15-build: --cross-prefix-x86_64=x86_64-elf- --disable-plugins TEST_TARGETS: check-unit run-tcg-tests-aarch64-softmmu run-tcg-tests-i386-softmmu run-tcg-tests-x86_64-softmmu + +aarch64-macos-26-build: + extends: .macos_job_template + image: macos-26-xcode-26 + variables: + NAME: macos-26 + DYLD_LIBRARY_PATH: /opt/homebrew/opt/expat/lib/ + PATH_EXTRA: /opt/homebrew/gettext/bin + PKG_CONFIG_PATH: /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurses/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig + CONFIGURE_ARGS: + --target-list=aarch64-softmmu,i386-softmmu,x86_64-softmmu + --cross-prefix-aarch64=aarch64-elf- + --cross-prefix-i386=i686-elf- + --cross-prefix-x86_64=x86_64-elf- + --disable-plugins + TEST_TARGETS: check-unit run-tcg-tests-aarch64-softmmu run-tcg-tests-i386-softmmu run-tcg-tests-x86_64-softmmu -- 2.47.3
