diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2020-03-15 15:05:41 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2020-03-15 15:05:41 +0000 |
| commit | 14df2c77c0cf1e388710739ef76cc668cdd6e629 (patch) | |
| tree | 134eea2da07bc153507875e5b6ad466851c04e76 | |
| parent | 5a9ce5b59a70493a72bbf6d114933dd84e2aa099 (diff) | |
| download | clutter-14df2c77c0cf1e388710739ef76cc668cdd6e629.tar.gz | |
ci: Update the Docker image
Don't use something from ancient times, even if we haven't touched
Clutter in a long while.
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34a7031d0..c509ac849 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: - _ccache/ meson-fedora-x86_64: - image: registry.gitlab.gnome.org/gnome/clutter/master:v1 + image: registry.gitlab.gnome.org/gnome/clutter/master:v2 stage: build script: - bash -x ./.gitlab-ci/test-docker.sh diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 091710d30..231d4dedb 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:28 +FROM fedora:31 RUN dnf -y install \ adwaita-icon-theme \ @@ -57,7 +57,7 @@ RUN dnf -y install \ xorg-x11-server-Xvfb \ && dnf clean all -RUN pip3 install meson +RUN pip3 install meson==0.49.2 ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} |