sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

ci: Bump to F35

Browse source 
Needs a couple of changes to make tests pass again:

  * mesa-dri-drivers needs explicit installation to install swrast dri
    driver
  * wireplumber needs to be started inside the D-Bus session

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2142>
This commit is contained in:
Jonas Ådahl 2021-12-07 10:23:37 +01:00 committed by Marge Bot
parent 75d8fedcf5
commit f5f59ad6e6
2 changed files with 33 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
.gitlab-ci.yml
View file

@ -1,6 +1,6 @@
include:
- remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/fedora.yml'
- remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/ci-fairy.yml'
- remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/34f4ade99434043f88e164933f570301fd18b125/templates/fedora.yml'
- remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/34f4ade99434043f88e164933f570301fd18b125/templates/ci-fairy.yml'
stages:
- review
@ -14,10 +14,10 @@ stages:
variables:
FDO_UPSTREAM_REPO: GNOME/mutter
.mutter.fedora:34@common:
.mutter.fedora:35@common:
variables:
FDO_DISTRIBUTION_VERSION: 34
BASE_TAG: '2021-09-15.0'
FDO_DISTRIBUTION_VERSION: 35
BASE_TAG: '2021-11-07.0'
FDO_DISTRIBUTION_PACKAGES:
asciidoc
clang
@ -28,6 +28,7 @@ variables:
sassc
uncrustify
xorg-x11-server-Xvfb
mesa-dri-drivers
FDO_DISTRIBUTION_EXEC: |
dnf install -y 'dnf-command(builddep)' &&
@ -37,22 +38,6 @@ variables:
dnf builddep -y libinput --setopt=install_weak_deps=False &&
dnf builddep -y wayland-protocols --setopt=install_weak_deps=False &&
./.gitlab-ci/install-meson-project.sh \
https://gitlab.gnome.org/GNOME/glib.git \
main . 02742ef957b532789c003eef80ec7f51c370e3d5 &&
./.gitlab-ci/install-meson-project.sh \
https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git \
41.alpha . &&
./.gitlab-ci/install-meson-project.sh \
https://gitlab.gnome.org/GNOME/gjs.git \
1.69.2 . &&
./.gitlab-ci/install-meson-project.sh \
https://gitlab.freedesktop.org/libinput/libinput.git \
1.19.0 . &&
./.gitlab-ci/install-meson-project.sh \
https://gitlab.freedesktop.org/wayland/wayland-protocols.git \
1.23 . &&
@ -75,13 +60,13 @@ default:
- 'scheduler_failure'
- 'api_failure'
.mutter.fedora:34@x86_64:
extends: .mutter.fedora:34@common
.mutter.fedora:35@x86_64:
extends: .mutter.fedora:35@common
variables:
FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}"
.mutter.fedora:34@aarch64:
extends: .mutter.fedora:34@common
.mutter.fedora:35@aarch64:
extends: .mutter.fedora:35@common
variables:
FDO_DISTRIBUTION_TAG: "aarch64-${BASE_TAG}"
tags:
@ -146,7 +131,7 @@ check-merge-request:
build-fedora-container@x86_64:
extends:
- .fdo.container-build@fedora@x86_64
- .mutter.fedora:34@x86_64
- .mutter.fedora:35@x86_64
stage: prepare
needs:
- check-commit-log
@ -157,7 +142,7 @@ build-fedora-container@x86_64:
build-fedora-container@aarch64:
extends:
- .fdo.container-build@fedora@aarch64
- .mutter.fedora:34@aarch64
- .mutter.fedora:35@aarch64
stage: prepare
needs:
- check-commit-log
@ -168,7 +153,7 @@ build-fedora-container@aarch64:
check-code-style:
extends:
- .fdo.distribution-image@fedora
- .mutter.fedora:34@x86_64
- .mutter.fedora:35@x86_64
stage: code-review
needs:
- build-fedora-container@x86_64
@ -200,21 +185,21 @@ check-code-style:
build-mutter@x86_64:
extends:
- .build-mutter
- .mutter.fedora:34@x86_64
- .mutter.fedora:35@x86_64
needs:
- build-fedora-container@x86_64
build-mutter@aarch64:
extends:
- .build-mutter
- .mutter.fedora:34@aarch64
- .mutter.fedora:35@aarch64
needs:
- build-fedora-container@aarch64
build-without-opengl-and-glx@x86_64:
extends:
- .fdo.distribution-image@fedora
- .mutter.fedora:34@x86_64
- .mutter.fedora:35@x86_64
stage: build
needs:
- build-fedora-container@x86_64
@ -229,7 +214,7 @@ build-without-opengl-and-glx@x86_64:
build-without-native-backend-and-wayland@x86_64:
extends:
- .fdo.distribution-image@fedora
- .mutter.fedora:34@x86_64
- .mutter.fedora:35@x86_64
stage: build
needs:
- build-fedora-container@x86_64
@ -255,7 +240,6 @@ build-without-native-backend-and-wayland@x86_64:
before_script:
- glib-compile-schemas $GSETTINGS_SCHEMA_DIR
# Disable e.g. audio support to not dead lock screen cast tests
- rm -f /usr/share/pipewire/media-session.d/with-*
- mkdir -m 700 $XDG_RUNTIME_DIR
- pipewire & sleep 2
@ -266,7 +250,7 @@ build-without-native-backend-and-wayland@x86_64:
stage: test
script:
- dbus-run-session -- xvfb-run -a -s "$XVFB_SERVER_ARGS"
catchsegv meson test -C build --no-rebuild -t 10
./.gitlab-ci/run-tests.sh
artifacts:
expire_in: 1 day
reports:
@ -279,14 +263,14 @@ build-without-native-backend-and-wayland@x86_64:
test-mutter@x86_64:
extends:
- .test-mutter
- .mutter.fedora:34@x86_64
- .mutter.fedora:35@x86_64
needs:
- build-mutter@x86_64
test-mutter@aarch64:
extends:
- .test-mutter
- .mutter.fedora:34@aarch64
- .mutter.fedora:35@aarch64
needs:
- build-mutter@aarch64
@ -305,21 +289,21 @@ test-mutter@aarch64:
test-mutter-coverage@x86_64:
extends:
- .test-mutter-coverage
- .mutter.fedora:34@x86_64
- .mutter.fedora:35@x86_64
needs:
- test-mutter@x86_64
test-mutter-coverage@aarch64:
extends:
- .test-mutter-coverage
- .mutter.fedora:34@aarch64
- .mutter.fedora:35@aarch64
needs:
- test-mutter@aarch64
can-build-gnome-shell@x86_64:
extends:
- .fdo.distribution-image@fedora
- .mutter.fedora:34@x86_64
- .mutter.fedora:35@x86_64
stage: test
needs:
- build-mutter@x86_64
@ -337,7 +321,7 @@ test-mutter-coverity:
- when: manual
extends:
- .fdo.distribution-image@fedora
- .mutter.fedora:34@x86_64
- .mutter.fedora:35@x86_64
needs:
- build-fedora-container@x86_64
stage: analyze
@ -359,7 +343,7 @@ test-mutter-coverity:
dist-mutter:
extends:
- .fdo.distribution-image@fedora
- .mutter.fedora:34@x86_64
- .mutter.fedora:35@x86_64
<<: *test-setup
stage: deploy
needs:

8
.gitlab-ci/run-tests.sh Executable file
View file

@ -0,0 +1,8 @@
#!/usr/bin/bash
set -e
wireplumber &
sleep 1
catchsegv meson test -C build --no-rebuild -t 10