CI: Consistently build in ./build

This will make it easier to capture log files. All our CI builds happen
in an expendable checkout, so we can safely remove and re-create ./build.

Signed-off-by: Simon McVittie <smcv@collabora.com>

1 files changed, 13 insertions, 8 deletions

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index 590a74ba..2f309c19 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -175,10 +175,13 @@ maybe_fail_tests () {
 # own checks.
 NOCONFIGURE=1 ./autogen.sh
 
+# clean up directories from possible previous builds
+rm -rf "$builddir"
+rm -rf ci-build-dist
+rm -rf src-from-dist
+
 case "$ci_buildsys" in
     (cmake-dist)
-        # clean up directories from possible previous builds
-        rm -rf ci-build-dist
         # Do an Autotools `make dist`, then build *that* with CMake,
         # to assert that our official release tarballs will be enough
         # to build with CMake.
@@ -186,10 +189,17 @@ case "$ci_buildsys" in
         ( cd ci-build-dist; ../configure )
         make -C ci-build-dist dist
         tar --xz -xvf ci-build-dist/dbus-1.*.tar.xz
-        cd dbus-1.*/
+        mv dbus-1.*/ src-from-dist
+        srcdir="$(pwd)/src-from-dist"
+        ;;
+    (*)
+        srcdir="$(pwd)"
         ;;
 esac
 
+mkdir -p "$builddir"
+builddir="$(realpath "$builddir")"
+
 #
 # cross compile setup
 #
@@ -219,11 +229,6 @@ case "$ci_host" in
         ;;
 esac
 
-srcdir="$(pwd)"
-builddir="ci-build-${ci_variant}-${ci_host}"
-# clean up directories from possible previous builds
-rm -rf "$builddir"
-mkdir -p "$builddir"
 cd "$builddir"
 
 make="make -j${ci_parallel} V=1 VERBOSE=1"