diff options
| author | Christoph Reiter <creiter@src.gnome.org> | 2018-12-16 21:32:25 +0100 |
|---|---|---|
| committer | Christoph Reiter <creiter@src.gnome.org> | 2018-12-16 21:33:22 +0100 |
| commit | a99bd2a422f7c7a04c6dc43bd4d1e814cd187718 (patch) | |
| tree | d613e85e5508b929522d374e51134b903326ede7 | |
| parent | a0b5b39bbd096f869a7b4fa27538c43c6800a031 (diff) | |
| download | gtk+-a99bd2a422f7c7a04c6dc43bd4d1e814cd187718.tar.gz | |
ci: Update Docker image to Fedora 29 and meson to 0.49.0
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 4 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a67069ebee..b60004ae1e 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:v1 + image: registry.gitlab.gnome.org/gnome/gtk/master:v2 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:v1 + image: registry.gitlab.gnome.org/gnome/gtk/master:v2 stage: deploy script: - meson -Ddocumentation=true _build . diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 52dcaa1985..051bd9da4c 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:28 +FROM fedora:29 RUN dnf -y install \ hicolor-icon-theme \ @@ -70,7 +70,7 @@ RUN dnf -y install \ xorg-x11-server-Xvfb \ && dnf clean all -RUN pip3 install meson +RUN pip3 install meson==0.49.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 c7298bae30..1fba076bd9 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:v1" +TAG="registry.gitlab.gnome.org/gnome/gtk/master:v2" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" . |