From 2185e8f180f30a87d1a1f76505d9133e27cda1d6 Mon Sep 17 00:00:00 2001 From: Kenny Levinsen Date: Tue, 3 Nov 2020 15:22:46 +0100 Subject: ci: Clean up build manifests --- .builds/alpine.yml | 15 ++++----------- .builds/archlinux.yml | 12 +++--------- .builds/freebsd.yml | 13 ++++--------- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/.builds/alpine.yml b/.builds/alpine.yml index e048494..048e3ef 100644 --- a/.builds/alpine.yml +++ b/.builds/alpine.yml @@ -9,25 +9,18 @@ sources: - https://git.sr.ht/~kennylevinsen/seatd tasks: - prepare: | - cd seatd - meson build -Dseatd=enabled -Dbuiltin=enabled -Dlogind=disabled + meson -Dseatd=enabled -Dbuiltin=enabled -Dlogind=disabled build seatd - build: | - cd seatd ninja -C build - unittest: | - cd seatd ninja -C build test - scan-build: | - cd seatd ninja -C build scan-build [ -z "$(ls -A build/meson-logs/scanbuild/ 2>/dev/null)" ] - smoketest: | - cd seatd - timeout -s KILL 30s ./.builds/smoketest-seatd.sh + timeout -s KILL 30s ./seatd/.builds/smoketest-seatd.sh - smoketest-builtin: | - cd seatd - timeout -s KILL 30s ./.builds/smoketest-builtin.sh + timeout -s KILL 30s ./seatd/.builds/smoketest-builtin.sh - check-format: | - cd seatd ninja -C build clang-format - git diff --exit-code + git -C seatd diff --exit-code diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml index 419254f..301e88b 100644 --- a/.builds/archlinux.yml +++ b/.builds/archlinux.yml @@ -9,21 +9,15 @@ sources: - https://git.sr.ht/~kennylevinsen/seatd tasks: - prepare: | - cd seatd - meson -Db_sanitize=address -Dlogind=enabled -Dseatd=enabled -Dbuiltin=enabled build + meson -Db_sanitize=address -Dlogind=enabled -Dseatd=enabled -Dbuiltin=enabled build seatd - build: | - cd seatd ninja -C build - unittest: | - cd seatd ninja -C build test - scan-build: | - cd seatd ninja -C build scan-build [ -z "$(ls -A build/meson-logs/scanbuild/ 2>/dev/null)" ] - smoketest: | - cd seatd - timeout -s KILL 30s ./.builds/smoketest-seatd.sh + timeout -s KILL 30s ./seatd/.builds/smoketest-seatd.sh - smoketest-builtin: | - cd seatd - timeout -s KILL 30s ./.builds/smoketest-builtin.sh + timeout -s KILL 30s ./seatd/.builds/smoketest-builtin.sh diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index ca9a3c1..e13566a 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -5,20 +5,15 @@ sources: - https://git.sr.ht/~kennylevinsen/seatd tasks: - prepare: | - cd seatd - meson -Dseatd=enabled -Dbuiltin=enabled -Dlogind=disabled build + meson -Dseatd=enabled -Dbuiltin=enabled -Dlogind=disabled build seatd - build: | - cd seatd ninja -C build - unittest: | - cd seatd ninja -C build test - smoketest: | - cd seatd rm -rf build - meson -Db_lundef=false -Db_sanitize=address -Dseatd=enabled -Dbuiltin=enabled -Dlogind=disabled build + meson -Db_lundef=false -Db_sanitize=address -Dseatd=enabled -Dbuiltin=enabled -Dlogind=disabled build seatd ninja -C build - timeout -s KILL 30s ./.builds/smoketest-seatd.sh + timeout -s KILL 30s ./seatd/.builds/smoketest-seatd.sh - smoketest-builtin: | - cd seatd - timeout -s KILL 30s ./.builds/smoketest-builtin.sh + timeout -s KILL 30s ./seatd/.builds/smoketest-builtin.sh -- cgit v1.2.3