ci: Switch to mutter's docker image
Mutter's CI now also builds gnome-shell to ensure that a MR doesn't break the shell. Its docker image has therefore been updated to contain all our deps as well, so we don't need our own image anymore. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/546
This commit is contained in:
parent
33f5bb39cd
commit
6d4b9d29b8
@ -40,7 +40,7 @@ js_check:
|
|||||||
when: on_failure
|
when: on_failure
|
||||||
|
|
||||||
build:
|
build:
|
||||||
image: registry.gitlab.gnome.org/gnome/gnome-shell/master:v1
|
image: registry.gitlab.gnome.org/gnome/mutter/master:v1
|
||||||
stage: build
|
stage: build
|
||||||
before_script:
|
before_script:
|
||||||
- .gitlab-ci/checkout-mutter.sh
|
- .gitlab-ci/checkout-mutter.sh
|
||||||
@ -58,7 +58,7 @@ build:
|
|||||||
- build
|
- build
|
||||||
|
|
||||||
test:
|
test:
|
||||||
image: registry.gitlab.gnome.org/gnome/gnome-shell/master:v1
|
image: registry.gitlab.gnome.org/gnome/mutter/master:v1
|
||||||
stage: test
|
stage: test
|
||||||
before_script:
|
before_script:
|
||||||
- ninja -C mutter/build install
|
- ninja -C mutter/build install
|
||||||
@ -72,7 +72,7 @@ test:
|
|||||||
when: on_failure
|
when: on_failure
|
||||||
|
|
||||||
test-pot:
|
test-pot:
|
||||||
image: registry.gitlab.gnome.org/gnome/gnome-shell/master:v1
|
image: registry.gitlab.gnome.org/gnome/mutter/master:v1
|
||||||
stage: test
|
stage: test
|
||||||
before_script:
|
before_script:
|
||||||
- ninja -C mutter/build install
|
- ninja -C mutter/build install
|
||||||
|
@ -1,19 +0,0 @@
|
|||||||
FROM registry.gitlab.gnome.org/gnome/mutter/master:v1
|
|
||||||
|
|
||||||
RUN dnf -y update && dnf -y upgrade && \
|
|
||||||
dnf install -y 'dnf-command(copr)' && \
|
|
||||||
dnf copr enable -y fmuellner/gnome-shell-ci && \
|
|
||||||
dnf builddep -y gnome-shell --setopt=install_weak_deps=False && \
|
|
||||||
|
|
||||||
# bt only exports HAVE_BLUETOOTH to js, rest are outdated build-requires
|
|
||||||
dnf remove -y gnome-bluetooth-libs-devel dbus-glib-devel \
|
|
||||||
upower-devel python3-devel && \
|
|
||||||
|
|
||||||
# We'll build mutter ourselves
|
|
||||||
dnf remove -y --noautoremove mutter mutter-devel && \
|
|
||||||
|
|
||||||
# Needed for tests
|
|
||||||
dnf install -y '*/xvfb-run' gdm-lib accountsservice-libs && \
|
|
||||||
|
|
||||||
dnf clean all && \
|
|
||||||
rm -rf /var/cache/dnf
|
|
Loading…
Reference in New Issue
Block a user