diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2020-04-03 23:18:28 +0200 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2020-04-07 13:57:31 +0000 |
| commit | ce64ab5449ca053b662d95604a3239bf5cfc2a4f (patch) | |
| tree | cf4f4eb4a00fd7796fb71835394d53c4ca8a0b3c /.gitlab-ci | |
| parent | 8df3b21a51b0e8dcea4a4376426880e4f3c4f837 (diff) | |
| download | mutter-ce64ab5449ca053b662d95604a3239bf5cfc2a4f.tar.gz | |
ci: Rebase docker image to F32
We have branched now, time for a shiny new CI image.
Update the Dockerfile to:
- switch to F32
- use a single shared copr
- drop dependencies that are now covered by builddep
- do not include weak deps
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1176
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/Dockerfile | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 393c76394..c3913793a 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -1,32 +1,27 @@ # Rebuild and push with # # cd .gitlab-ci/ -# podman build --format docker --no-cache -t registry.gitlab.gnome.org/gnome/mutter/master:v3 . -# podman push registry.gitlab.gnome.org/gnome/mutter/master:v3 +# podman build --format docker --no-cache -t registry.gitlab.gnome.org/gnome/mutter/master:v4 . +# podman push registry.gitlab.gnome.org/gnome/mutter/master:v4 # -FROM fedora:31 +FROM fedora:32 RUN dnf -y update && dnf -y upgrade && \ dnf install -y 'dnf-command(builddep)' && \ dnf install -y 'dnf-command(copr)' && \ - dnf copr enable -y fmuellner/gnome-shell-ci && \ dnf copr enable -y jadahl/mutter-ci && \ - dnf -y update && dnf -y upgrade && \ - dnf builddep -y mutter && \ - - # Until Fedora catches up with new build-deps - dnf install -y 'pkgconfig(graphene-gobject-1.0)' 'pkgconfig(sysprof-capture-3)' && \ + dnf builddep -y mutter --setopt=install_weak_deps=False && \ # For running unit tests - dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 '*/xvfb-run' gdm-lib accountsservice-libs gnome-control-center && \ + dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 \ + '*/xvfb-run' gdm-lib accountsservice-libs gnome-control-center \ + --setopt=install_weak_deps=False && \ # GNOME Shell dnf builddep -y gnome-shell --setopt=install_weak_deps=False && \ - dnf remove -y gnome-bluetooth-libs-devel dbus-glib-devel upower-devel python3-devel && \ + dnf remove -y gnome-bluetooth-libs-devel && \ dnf remove -y --noautoremove mutter mutter-devel && \ - dnf upgrade -y 'pkgconfig(libpipewire-0.3)' && \ - dnf clean all |