diff options
| author | Kenny Levinsen <kl@kl.wtf> | 2021-09-15 23:30:53 +0200 |
|---|---|---|
| committer | Kenny Levinsen <kl@kl.wtf> | 2021-09-16 00:46:42 +0200 |
| commit | 4091ba2c07efde82a109fa8a07db77c814e90e5c (patch) | |
| tree | ebaf3347363aaf002d2b0877cde62e3eb282e33f | |
| parent | 66becee6dac74384439838c5c40624ae043fb7bf (diff) | |
ci: Install seatd instead of manipulating PATH
| -rw-r--r-- | .builds/alpine.yml | 1 | ||||
| -rw-r--r-- | .builds/archlinux.yml | 1 | ||||
| -rw-r--r-- | .builds/freebsd.yml | 1 | ||||
| -rwxr-xr-x | .builds/smoketest-seatd.sh | 3 |
4 files changed, 4 insertions, 2 deletions
diff --git a/.builds/alpine.yml b/.builds/alpine.yml index adea8ed..20f5fef 100644 --- a/.builds/alpine.yml +++ b/.builds/alpine.yml @@ -13,6 +13,7 @@ tasks: meson -Dlibseat-seatd=enabled -Dlibseat-builtin=enabled -Dlibseat-logind=disabled -Dexamples=enabled build seatd - build: | ninja -C build + sudo ninja -C build install - unittest: | ninja -C build test - scan-build: | diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml index 3e1574b..3f7463c 100644 --- a/.builds/archlinux.yml +++ b/.builds/archlinux.yml @@ -12,6 +12,7 @@ tasks: meson -Db_sanitize=address -Dlibseat-logind=auto -Dlibseat-seatd=enabled -Dlibseat-builtin=enabled -Dexamples=enabled build seatd - build: | ninja -C build + sudo ninja -C build install - unittest: | ninja -C build test - scan-build: | diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index 1b4ceba..79bee15 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -14,6 +14,7 @@ tasks: rm -rf build meson -Db_lundef=false -Db_sanitize=address -Dlibseat-seatd=enabled -Dlibseat-builtin=enabled -Dexamples=enabled -Dlibseat-logind=disabled build seatd ninja -C build + sudo ninja -C build install timeout -s KILL 30s ./seatd/.builds/smoketest-seatd.sh - smoketest-builtin: | timeout -s KILL 30s ./seatd/.builds/smoketest-builtin.sh diff --git a/.builds/smoketest-seatd.sh b/.builds/smoketest-seatd.sh index 96f554b..f471928 100755 --- a/.builds/smoketest-seatd.sh +++ b/.builds/smoketest-seatd.sh @@ -13,7 +13,6 @@ else fi export SEATD_LOGLEVEL=debug -export PATH=$(pwd)/build:$PATH # # Run simpletest a few times # @@ -21,7 +20,7 @@ cnt=0 while [ "$cnt" -lt 2 ] do echo "Simpletest run $((cnt+1))" - if ! sudo -E seatd-launch ./build/simpletest $file + if ! sudo -E ./build/seatd-launch ./build/simpletest $file then echo "Simpletest failed" exit 1 |