From: Tim Clem tclem@codeweavers.com
Two main changes: - VM configuration in build.yml for the executor. - The build-mac script is now architecture-agnostic. --- tools/gitlab/build-mac | 24 ++++++++++++++++++++++-- tools/gitlab/build.yml | 5 ++++- 2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/tools/gitlab/build-mac b/tools/gitlab/build-mac index 98df7731ad1..1cfd547f84f 100755 --- a/tools/gitlab/build-mac +++ b/tools/gitlab/build-mac @@ -5,15 +5,35 @@ echo "---"
set -Eeuxo pipefail
+X86_BREW_HOME='/usr/local' +if [ "$(arch)" = 'x86_64' ]; then + ARCH_BREW_HOME="$X86_BREW_HOME" +else + ARCH_BREW_HOME='/opt/homebrew' +fi + +# Pick up dependencies from homebrew. +export PATH="$X86_BREW_HOME/bin:$ARCH_BREW_HOME/bin:$PATH" +export LIBRARY_PATH="$X86_BREW_HOME/lib" + +# x86 ccache wrappers. +export PATH="$X86_BREW_HOME/opt/ccache/libexec:$PATH" + +# SDKROOT is independent of DEVELOPER_DIR/xcode-select, and will default to the +# command line tools. +export SDKROOT="$(xcode-select -p)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" + ./tools/make_requests ./tools/make_specfiles ./tools/make_makefiles autoreconf -f
cd build64 -../configure -C --enable-win64 --with-mingw BISON=/usr/local/opt/bison/bin/bison -make -s -j8 +# The `arch` command will be a no-op if we're on Intel. +arch -x86_64 ../configure -C --enable-win64 --with-mingw BISON="$ARCH_BREW_HOME/opt/bison/bin/bison" +arch -x86_64 make -s -j8 cd ..
git reset --hard + sleep 2 diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 66daf518386..528d998b644 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -52,6 +52,10 @@ build-clang:
build-mac: extends: .wine-build + image: winehq-sonoma-pristine + variables: + TART_EXECUTOR_SSH_USERNAME: "gitlab" + TART_EXECUTOR_SSH_PASSWORD: "gitlab" rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' tags: @@ -63,7 +67,6 @@ build-mac: - build32/config.log script: - mkdir -p build32 build64 - - export PATH="/usr/local/opt/ccache/libexec:$PATH" - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-mac
build-winetest: