From 47242308957afa7fb1f631e13a9049e9864862a7 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 3 Feb 2023 11:46:57 +0000 Subject: CI: Fix build in a fork whose name is not accountsservice I named my fork smcv/accountsservice-branches> and now I regret that choice. Signed-off-by: Simon McVittie --- .ci/run-tests.sh | 2 +- .gitlab-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/run-tests.sh b/.ci/run-tests.sh index 816509b..93d616b 100755 --- a/.ci/run-tests.sh +++ b/.ci/run-tests.sh @@ -5,7 +5,7 @@ set -e SRCDIR=`pwd` cd /home/user cp -r $SRCDIR ./ -cd accountsservice +cd "${CI_PROJECT_NAME}" meson setup --localstatedir /var -Db_coverage=true _build # FIXME until we can figure out how to depend on mocklibc being built for the tests meson compile -C _build diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c3a4c4..9808380 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,7 +50,7 @@ test-fedora: script: - useradd -u 5555 -ms /bin/bash user - su user -c .ci/run-tests.sh - - cp -r /home/user/accountsservice/_build/ ./ + - cp -r "/home/user/${CI_PROJECT_NAME}/_build/" ./ - .ci/fail_skipped_tests.py _build/meson-logs/testlog.junit.xml - cat _build/meson-logs/coverage.txt artifacts: -- cgit v1.2.1