diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-05-05 23:17:07 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-05-05 23:17:07 +0000 |
commit | c8eeb46aa5d0003c743366c28de7201ab10372bb (patch) | |
tree | ff2c26a921d996cc7e34136de223f2e8c331a727 /.gitlab-ci.yml | |
parent | d143f76568c6a51398ea1996ef69ca0036694783 (diff) | |
parent | 930ff499ee25d8606c6ca0b00084dea3ac0d1fd9 (diff) | |
download | gtk+-c8eeb46aa5d0003c743366c28de7201ab10372bb.tar.gz |
Merge branch 'update-ci-to-f34' into 'master'
WIP ci: Update the image to Fedora 34
See merge request GNOME/gtk!3516
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ded2c02f2..9c073fbed0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,9 +24,9 @@ variables: BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true" FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled" MESON_TEST_TIMEOUT_MULTIPLIER: 3 - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v29" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v30" FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master" - DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v29" + DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v30" .only-default: only: @@ -77,6 +77,7 @@ fedora-x86_64: variables: EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both" script: + - .gitlab-ci/show-info-linux.sh - meson subprojects update - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS} _build @@ -92,6 +93,7 @@ release-build: variables: EXTRA_MESON_FLAGS: "--buildtype=release" script: + - .gitlab-ci/show-info-linux.sh - meson subprojects update - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS} _build @@ -106,6 +108,7 @@ installed-tests: EXTRA_MESON_FLAGS: "--prefix=/usr --libdir=/usr/lib64 -Dinstall-tests=true" G_TEST_ACCESSIBLE: 1 script: + - .gitlab-ci/show-info-linux.sh - meson subprojects update - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS} _build @@ -155,7 +158,7 @@ macos: - macos needs: [] before_script: - - bash .gitlab-ci/show-execution-environment.sh + - bash .gitlab-ci/show-info-osx.sh - pip3 install --user meson==0.56 - pip3 install --user ninja - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH |