diff options
| author | Kenny Levinsen <kl@kl.wtf> | 2021-04-14 22:37:36 +0200 |
|---|---|---|
| committer | Kenny Levinsen <kl@kl.wtf> | 2021-04-15 22:35:48 +0200 |
| commit | 0db9176cbda0e8ac85b432935163785f1e606182 (patch) | |
| tree | ee0acd02e347138f44c1a61481f34a8d316c04d5 | |
| parent | 97d421a7e8103866b2eb69b2f5aac33054f5518d (diff) | |
| download | weston-0db9176cbda0e8ac85b432935163785f1e606182.tar.gz | |
ci: Build with libseat enabled
This installs libseat in the debian image build from source in order to enable,
build and test weston with libseat support.
Signed-off-by: Kenny Levinsen <kl@kl.wtf>
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab-ci/debian-install.sh | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ceae79d..db2e42bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ stages: variables: FDO_DISTRIBUTION_VERSION: buster FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/debian-install.sh' - FDO_DISTRIBUTION_TAG: '2021-03-04.1' + FDO_DISTRIBUTION_TAG: '2021-04-15.2' container_prep: @@ -106,6 +106,7 @@ build-native-meson-default-options: -Db_coverage=true -Dwerror=true -Dtest-skip-is-failure=true + -Dlauncher-libseat=true extends: .build-native-meson after_script: - ninja -C build-* coverage-html @@ -130,6 +131,7 @@ build-native-meson-no-gl-renderer: -Dremoting=false -Dpipewire=false -Dwerror=true + -Dlauncher-libseat=true extends: .build-native-meson docs-and-coverage: diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 4cad75a4..e9175340 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -162,5 +162,14 @@ ninja -C build install cd .. rm -rf pipewire +git clone --depth=1 --branch 0.5.0 https://git.sr.ht/~kennylevinsen/seatd +cd seatd +meson build -Dauto_features=disabled \ + -Dseatd=enabled -Dlogind=enabled -Dserver=enabled \ + -Dexamples=disabled -Dman-pages=disabled +ninja -C build install +cd .. +rm -rf seatd + apt-get -y --autoremove purge $LINUX_DEV_PKGS apt-get -y --autoremove purge $MESA_DEV_PKGS |