diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2020-11-09 11:06:14 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-02-25 13:26:40 +0000 |
| commit | 83d203d460c49d4d7f3d571f70751c071f4f2103 (patch) | |
| tree | 0a7f35961e7b5d9685c64b3bc2024fc17e2514fc | |
| parent | e9b0e6069d23c8e75c2a2591a294fb4e8353852d (diff) | |
| download | dbus-83d203d460c49d4d7f3d571f70751c071f4f2103.tar.gz | |
tools/ci-build.sh: Clean up directories from possible previous builds
Otherwise, ci-build.sh cannot be executed on a local system if there
are previous runs.
(cherry picked from commit e82d5fe48623337fd5a69317e27b7a8ce195398a)
| -rwxr-xr-x | tools/ci-build.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/ci-build.sh b/tools/ci-build.sh index e92d85b3..1db4edf6 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -100,10 +100,12 @@ NOCONFIGURE=1 ./autogen.sh 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. - mkdir ci-build-dist + mkdir -p ci-build-dist ( cd ci-build-dist; ../configure ) make -C ci-build-dist dist tar -zxvf ci-build-dist/dbus-1.*.tar.gz @@ -131,7 +133,9 @@ case "$ci_host" in esac srcdir="$(pwd)" -mkdir ci-build-${ci_variant}-${ci_host} +# clean up directories from possible previous builds +rm -rf ci-build-${ci_variant}-${ci_host} +mkdir -p ci-build-${ci_variant}-${ci_host} cd ci-build-${ci_variant}-${ci_host} make="make -j${ci_parallel} V=1 VERBOSE=1" |