diff options
author | Emmanuele Bassi <ebassi@gmail.com> | 2021-04-06 13:20:23 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gmail.com> | 2021-04-06 13:20:23 +0000 |
commit | 8f90431a01d7333ea8680fd2f9703bacac3e28a2 (patch) | |
tree | f8b54628a48edc9eaa9d0b9862526d7a3b6d5ead | |
parent | 3ba5a6156f7c4df4af51fa944e806913b828764b (diff) | |
parent | c763e0a7071f816d7c88410468c88e8511618cec (diff) | |
download | gdk-pixbuf-8f90431a01d7333ea8680fd2f9703bacac3e28a2.tar.gz |
Merge branch 'ebassi/msys2-update' into 'master'
ci: Drop old dependencies from MSYS2 job
See merge request GNOME/gdk-pixbuf!108
-rw-r--r-- | .gitlab-ci.yml | 34 | ||||
-rw-r--r-- | .gitlab/ci/test-msys2.sh | 14 |
2 files changed, 21 insertions, 27 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d52caf6b..2379cc9a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,6 +75,23 @@ macos: paths: - "${CI_PROJECT_DIR}/_build/meson-logs" +msys2-mingw64: + stage: build + needs: [] + tags: + - win32-ps + variables: + MSYSTEM: "MINGW64" + CHERE_INVOKING: "yes" + script: + - C:\msys64\usr\bin\pacman --noconfirm -Syyuu + - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab/ci/test-msys2.sh" + artifacts: + name: "gdk-pixbuf-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}" + when: always + paths: + - _build/meson-logs + release-build: stage: build extends: .build-linux @@ -162,20 +179,3 @@ pages: - public only: - master - -msys2-mingw64: - stage: build - needs: [] - tags: - - win32-ps - variables: - MSYSTEM: "MINGW64" - CHERE_INVOKING: "yes" - script: - - C:\msys64\usr\bin\pacman --noconfirm -Syyuu - - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab/ci/test-msys2.sh" - artifacts: - name: "gdk-pixbuf-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}" - when: always - paths: - - _build/meson-logs diff --git a/.gitlab/ci/test-msys2.sh b/.gitlab/ci/test-msys2.sh index 56258b3de..b5a94c946 100644 --- a/.gitlab/ci/test-msys2.sh +++ b/.gitlab/ci/test-msys2.sh @@ -14,23 +14,17 @@ pacman --noconfirm -S --needed \ base-devel \ mingw-w64-$MSYS2_ARCH-gobject-introspection \ mingw-w64-$MSYS2_ARCH-glib2 \ - mingw-w64-$MSYS2_ARCH-jasper \ mingw-w64-$MSYS2_ARCH-libjpeg-turbo \ mingw-w64-$MSYS2_ARCH-libpng \ mingw-w64-$MSYS2_ARCH-libtiff \ mingw-w64-$MSYS2_ARCH-meson \ - mingw-w64-$MSYS2_ARCH-toolchain \ - mingw-w64-$MSYS2_ARCH-gtk-doc + mingw-w64-$MSYS2_ARCH-toolchain -meson --buildtype debug \ - -Dx11=false \ +meson setup --buildtype debug \ -Dpng=true \ -Djpeg=true \ -Dtiff=true \ - -Djasper=true \ _build -cd _build -ninja - -meson test +meson compile -C _build +meson test -C _build |