diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2020-04-04 02:03:24 +0200 |
|---|---|---|
| committer | verdre <jonas@dressler.it> | 2020-04-28 09:04:49 +0000 |
| commit | f89091d0f09a0acfa648f1d1cfb68a046dee3edf (patch) | |
| tree | 693902ddbd9996fbe8175e89ef759872cec008d3 /.gitlab-ci | |
| parent | 859927df3971ed199b5d972060594a97cd6a7e07 (diff) | |
| download | gnome-shell-f89091d0f09a0acfa648f1d1cfb68a046dee3edf.tar.gz | |
ci: Rebase extension-ci image to F32
... and base our 'js' test on the js engine we are actually using.
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1177
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/Dockerfile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 4c7f1097d..fd0eb2a93 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -1,17 +1,17 @@ # Rebuild and push with # # cd .gitlab-ci/ -# podman build --format docker --no-cache -t registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1 . -# podman push registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1 +# podman build --format docker --no-cache -t registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v2 . +# podman push registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v2 # -FROM registry.fedoraproject.org/fedora:latest +FROM registry.fedoraproject.org/fedora:32 RUN dnf -y update && dnf -y upgrade && \ dnf install -y 'dnf-command(copr)' git && \ - # For syntax checks with `find . -name '*.js' -exec js60 -c -s '{}' ';'` - dnf install -y findutils mozjs60-devel && \ + # For syntax checks with `find . -name '*.js' -exec js68 -c -s '{}' ';'` + dnf install -y findutils mozjs68-devel && \ # For static analysis with eslint dnf install -y nodejs && \ @@ -21,5 +21,4 @@ RUN dnf -y update && dnf -y upgrade && \ dnf copr enable -y fmuellner/gnome-shell-ci && \ dnf install -y gnome-extensions-tool meson && \ - dnf clean all && \ - rm -rf /var/cache/dnf + dnf clean all |