summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml22
-rwxr-xr-x[-rw-r--r--].gitlab-ci/test-msys2.sh10
2 files changed, 31 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 98a731220..4dcab274e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -318,6 +318,28 @@ msys2-mingw32:
- _build/meson-logs
- _coverage/
+msys2-clang64:
+ extends: .only-schedules
+ stage: build
+ tags:
+ - win32-ps
+ needs: []
+ variables:
+ MSYSTEM: "CLANG64"
+ CHERE_INVOKING: "yes"
+ script:
+ - C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20
+ - C:\msys64\usr\bin\bash .gitlab-ci/show-execution-environment.sh
+ - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
+ artifacts:
+ reports:
+ junit: "_build/meson-logs/testlog.junit.xml"
+ name: "glib-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}"
+ when: always
+ expire_in: 1 week
+ paths:
+ - _build/meson-logs
+
vs2017-x64:
extends: .only-default
stage: build
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index c834e81ad..85394a754 100644..100755
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -32,7 +32,15 @@ PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH"
DIR="$(pwd)"
export PATH CFLAGS
-meson --werror --buildtype debug _build
+if [[ "$MSYSTEM" == "CLANG64" ]]; then
+ # FIXME: fix the clang build warnings
+ # shellcheck disable=SC2086
+ meson ${MESON_COMMON_OPTIONS} _build
+else
+ # shellcheck disable=SC2086
+ meson ${MESON_COMMON_OPTIONS} --werror _build
+fi
+
cd _build
ninja