diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-12-08 21:00:58 +0100 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2018-12-08 22:14:05 +0100 |
| commit | 08671f431b66cefe8dcb5718e3828887e98e7636 (patch) | |
| tree | 62892e527e84b472d27fc180de486e277c6d0349 /.gitlab-ci.yml | |
| parent | 9aefac0379809d43d9450570cddebd222f7c5625 (diff) | |
| download | gobject-introspection-08671f431b66cefe8dcb5718e3828887e98e7636.tar.gz | |
ci: Add a msys2 autotools job
Getting rid of autotools wont be easy, so make sure we run all tests on Windows,
not just the ones ported to meson.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2562d2a3..50e7a4ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ cache: paths: - _ccache/ -fedora-x86_64-meson-python3: +fedora-x86_64-meson: stage: build variables: CCACHE_BASEDIR: "${CI_PROJECT_DIR}" @@ -28,7 +28,7 @@ fedora-x86_64-meson-python3: paths: - "${CI_PROJECT_DIR}/_build/meson-logs" -fedora-x86_64-autotools-python3: +fedora-x86_64-autotools: stage: build variables: CCACHE_BASEDIR: "${CI_PROJECT_DIR}" @@ -47,7 +47,7 @@ fedora-x86_64-autotools-python3: paths: - "${CI_PROJECT_DIR}/*/scanner/test-suite.log" -msys2-mingw32-python3: +msys2-mingw32-meson: stage: build tags: - win32 @@ -56,14 +56,30 @@ msys2-mingw32-python3: CHERE_INVOKING: "yes" script: - C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20 - - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh" + - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2-meson.sh" artifacts: when: on_failure name: "gi-_%CI_COMMIT_REF_NAME%" paths: - _build/meson-logs -vs2017-x64-python3: +msys2-mingw32-autotools: + stage: build + tags: + - win32 + variables: + MSYSTEM: "MINGW32" + CHERE_INVOKING: "yes" + script: + - C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20 + - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2-autotools.sh" + artifacts: + when: on_failure + name: "gi-_%CI_COMMIT_REF_NAME%" + paths: + - _build/meson-logs + +vs2017-x64-meson: stage: build allow_failure: true tags: |