diff --git a/tools/gitlab/build-mac b/tools/gitlab/build-mac new file mode 100755 index 00000000000..701366277fc --- /dev/null +++ b/tools/gitlab/build-mac @@ -0,0 +1,17 @@ +#!/bin/bash + +echo "Building $(git log -1)" +echo "---" + +set -Eeuxo pipefail + +./tools/make_requests +./tools/make_makefiles +autoreconf + +cd build64 +../configure -C --enable-win64 --with-mingw BISON=/usr/local/opt/bison/bin/bison +make -s -j8 +cd .. + +git reset --hard diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index c8be84ccd67..34e0268ca04 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -33,6 +33,22 @@ build-all: - rm -fr .git/rebase-merge # in case a previous CI run failed in git rebase - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-all +build-mac: + extends: .wine-build + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + tags: + - mac + artifacts: + when: on_failure + paths: + - build64/config.log + - build32/config.log + script: + - rm -fr .git/rebase-merge + - export PATH="/usr/local/opt/ccache/libexec:$PATH" + - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-mac + build-winetest: extends: .wine-build rules: