diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2022-07-16 20:43:39 +0200 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2022-07-19 23:22:50 +0200 |
| commit | d81b95acf89e09bb96504aa865957f9c1a4c5881 (patch) | |
| tree | df7cdd6e4708386cdec56368482eeb73d1a47513 | |
| parent | ebd0f1282846ab1e325b7c9b4161b4d1cc5fa54c (diff) | |
| download | gobject-introspection-d81b95acf89e09bb96504aa865957f9c1a4c5881.tar.gz | |
CI: test with clang + mingw-w64 on Windows
The toolchain is different enough to warrant its own CI job imo.
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rw-r--r-- | .gitlab-ci/test-msys2-meson.sh | 32 |
2 files changed, 29 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18c9c7be..85f622d3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -143,6 +143,22 @@ msys2-mingw64-meson: paths: - _build/meson-logs +msys2-clang64-meson: + stage: build + tags: + - win32-ps + variables: + MSYSTEM: "CLANG64" + CHERE_INVOKING: "yes" + script: + - C:\msys64\usr\bin\pacman --noconfirm -Syyuu + - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2-meson.sh" + artifacts: + when: on_failure + name: "gi-_${env:CI_COMMIT_REF_NAME}" + paths: + - _build/meson-logs + vs2017-x64-meson: stage: build tags: diff --git a/.gitlab-ci/test-msys2-meson.sh b/.gitlab-ci/test-msys2-meson.sh index c61efcde..2fe3d6e0 100644 --- a/.gitlab-ci/test-msys2-meson.sh +++ b/.gitlab-ci/test-msys2-meson.sh @@ -2,30 +2,24 @@ set -e -if [[ "$MSYSTEM" == "MINGW32" ]]; then - export MSYS2_ARCH="i686" -else - export MSYS2_ARCH="x86_64" -fi - pacman --noconfirm -Suy pacman --noconfirm -S --needed \ git \ base-devel \ - mingw-w64-$MSYS2_ARCH-toolchain \ - mingw-w64-$MSYS2_ARCH-ccache \ - mingw-w64-$MSYS2_ARCH-meson \ - mingw-w64-$MSYS2_ARCH-python3 \ - mingw-w64-$MSYS2_ARCH-python3-pip \ - mingw-w64-$MSYS2_ARCH-python3-mako \ - mingw-w64-$MSYS2_ARCH-python3-markdown \ - mingw-w64-$MSYS2_ARCH-libffi \ - mingw-w64-$MSYS2_ARCH-pkg-config \ - mingw-w64-$MSYS2_ARCH-cairo \ - mingw-w64-$MSYS2_ARCH-pcre2 \ - mingw-w64-$MSYS2_ARCH-zlib \ - mingw-w64-$MSYS2_ARCH-gettext + ${MINGW_PACKAGE_PREFIX}-toolchain \ + ${MINGW_PACKAGE_PREFIX}-ccache \ + ${MINGW_PACKAGE_PREFIX}-meson \ + ${MINGW_PACKAGE_PREFIX}-python3 \ + ${MINGW_PACKAGE_PREFIX}-python3-pip \ + ${MINGW_PACKAGE_PREFIX}-python3-mako \ + ${MINGW_PACKAGE_PREFIX}-python3-markdown \ + ${MINGW_PACKAGE_PREFIX}-libffi \ + ${MINGW_PACKAGE_PREFIX}-pkg-config \ + ${MINGW_PACKAGE_PREFIX}-cairo \ + ${MINGW_PACKAGE_PREFIX}-pcre2 \ + ${MINGW_PACKAGE_PREFIX}-zlib \ + ${MINGW_PACKAGE_PREFIX}-gettext export CCACHE_BASEDIR="${CI_PROJECT_DIR}" export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" |