diff options
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b60004ae1e..620cba17f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ stages: - subprojects/pango/ fedora-x86_64: - image: registry.gitlab.gnome.org/gnome/gtk/master:v2 + image: registry.gitlab.gnome.org/gnome/gtk/master:v3 stage: build script: - bash -x ./.gitlab-ci/test-docker.sh @@ -64,7 +64,7 @@ flatpak:widget-factory: <<: *flatpak-defaults pages: - image: registry.gitlab.gnome.org/gnome/gtk/master:v2 + image: registry.gitlab.gnome.org/gnome/gtk/master:v3 stage: deploy script: - meson -Ddocumentation=true _build . diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 051bd9da4c..a2866c5fac 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -70,7 +70,7 @@ RUN dnf -y install \ xorg-x11-server-Xvfb \ && dnf clean all -RUN pip3 install meson==0.49.0 +RUN pip3 install meson==0.50.0 ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index 1fba076bd9..4b103b09a7 100755 --- a/.gitlab-ci/run-docker.sh +++ b/.gitlab-ci/run-docker.sh @@ -2,7 +2,7 @@ set -e -TAG="registry.gitlab.gnome.org/gnome/gtk/master:v2" +TAG="registry.gitlab.gnome.org/gnome/gtk/master:v3" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" . |