From: Jacek Caban jacek@codeweavers.com
--- tools/gitlab/build-clang | 16 ++++++++++++++++ tools/gitlab/build.yml | 11 +++++++++++ tools/gitlab/image.docker | 1 + 3 files changed, 28 insertions(+) create mode 100755 tools/gitlab/build-clang
diff --git a/tools/gitlab/build-clang b/tools/gitlab/build-clang new file mode 100755 index 00000000000..b412b97863f --- /dev/null +++ b/tools/gitlab/build-clang @@ -0,0 +1,16 @@ +#!/bin/bash + +echo "Building $(git log -1)" +echo "---" + +set -Eeuxo pipefail + +./tools/make_requests +./tools/make_makefiles +autoreconf -f + +./configure -q --enable-archs=i386,x86_64,aarch64 --with-mingw=clang +make -s -j$(nproc) +make -s -j$(nproc) install-lib install-test DESTDIR=$BASEDIR + +git reset --hard diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 81d0e3f969c..dd6e83f8de8 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -39,6 +39,17 @@ build-linux: - git diff --name-only $CI_MERGE_REQUEST_DIFF_BASE_SHA | sed -re '//tests//!d; s@/tests/.*@/tests/Makefile.in@' | (xargs -r ls 2>/dev/null || true) | xargs -r sed '/TESTDLL/!d; s@.dll@@; s@.*= *@@' >usr/local/share/wine/winetest.args
+build-clang: + extends: .wine-build + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + artifacts: + expire_in: 1 day + paths: + - usr/local/ + script: + - ./tools/gitlab/build-clang + build-mac: extends: .wine-build rules: diff --git a/tools/gitlab/image.docker b/tools/gitlab/image.docker index 8ff9055df2f..4a380dfb51b 100644 --- a/tools/gitlab/image.docker +++ b/tools/gitlab/image.docker @@ -13,6 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ dpkg --add-architecture i386 && \ apt-get update && \ apt-get install -y gcc gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 gcc-multilib \ + llvm clang lld \ git autoconf flex bison perl gettext \ libasound2-dev:amd64 libasound2-dev:i386 \ libcapi20-dev:amd64 libcapi20-dev:i386 \