ci: Use ci-fairy image in review and run first

This image is much smaller than the one with all the build dependencies,
thus will finish much faster.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1586>
This commit is contained in:
Jonas Ådahl 2020-11-20 17:56:31 +01:00 committed by Marge Bot
parent efbb798309
commit 07c64ded78

View File

@ -1,9 +1,10 @@
include: include:
- remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/97556201e6e0e30554ee93249f5287be826be718/templates/fedora.yml' - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/97556201e6e0e30554ee93249f5287be826be718/templates/fedora.yml"
- remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/97556201e6e0e30554ee93249f5287be826be718/templates/ci-fairy.yml"
stages: stages:
- prepare
- review - review
- prepare
- build - build
- test - test
- coverage - coverage
@ -62,15 +63,15 @@ build-fedora-container:
- .fdo.container-build@fedora@x86_64 - .fdo.container-build@fedora@x86_64
- .mutter.fedora:33 - .mutter.fedora:33
stage: prepare stage: prepare
needs:
- check-commit-log
- check-merge-request
<<: *only_default <<: *only_default
check-commit-log: check-commit-log:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.ci-fairy
- .mutter.fedora:33
stage: review stage: review
needs:
- build-fedora-container
variables: variables:
GIT_DEPTH: "100" GIT_DEPTH: "100"
script: script:
@ -88,7 +89,7 @@ build-mutter:
- .mutter.fedora:33 - .mutter.fedora:33
stage: build stage: build
needs: needs:
- check-commit-log - build-fedora-container
script: script:
- meson . build -Dbuildtype=debugoptimized -Db_coverage=true -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr - meson . build -Dbuildtype=debugoptimized -Db_coverage=true -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr
- ninja -C build - ninja -C build
@ -104,7 +105,7 @@ build-without-opengl-and-glx:
- .mutter.fedora:33 - .mutter.fedora:33
stage: build stage: build
needs: needs:
- check-commit-log - build-fedora-container
script: script:
- meson . build -Dbuildtype=debugoptimized -Dopengl=false -Dglx=false -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr - meson . build -Dbuildtype=debugoptimized -Dopengl=false -Dglx=false -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr
- ninja -C build - ninja -C build
@ -119,7 +120,7 @@ build-without-native-backend-and-wayland:
- .mutter.fedora:33 - .mutter.fedora:33
stage: build stage: build
needs: needs:
- check-commit-log - build-fedora-container
script: script:
- meson . build -Dbuildtype=debugoptimized -Dnative_backend=false -Dudev=false -Dwayland=false -Dcore_tests=false --werror --prefix /usr - meson . build -Dbuildtype=debugoptimized -Dnative_backend=false -Dudev=false -Dwayland=false -Dcore_tests=false --werror --prefix /usr
- ninja -C build - ninja -C build