ci: Install seatd instead of manipulating PATH

This commit is contained in:
Kenny Levinsen 2021-09-15 23:30:53 +02:00
parent 66becee6da
commit 4091ba2c07
4 changed files with 4 additions and 2 deletions

View file

@ -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: |

View file

@ -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: |

View file

@ -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

View file

@ -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