isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Make sure to always clear meson-install checkout dir

Browse Source 
We currently remove the directory at the end of the script, but
that code is only reached when all previous operations were
successful.

Address this by first using an absolute directory path in /tmp
instead of a "random" location based on the CWD, then set a trap
to remove it on exit.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2712>
This commit is contained in:
Florian Müllner 2023-03-21 01:00:07 +01:00 committed by Marge Bot
parent 919812a851
commit fac05b182c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitlab-ci/install-meson-project.sh
View File

@ -31,14 +31,13 @@ COMMIT="$2"
SUBDIR="$3" SUBDIR="$3"
PREPARE="$4" PREPARE="$4"
REPO_DIR="$(basename ${REPO_URL%.git})" CHECKOUT_DIR=$(mktemp --directory)
trap "rm -rf $CHECKOUT_DIR" EXIT
git clone --depth 1 "$REPO_URL" -b "$COMMIT" git clone --depth 1 "$REPO_URL" -b "$COMMIT" "$CHECKOUT_DIR"
pushd "$REPO_DIR"
pushd "$SUBDIR" pushd "$CHECKOUT_DIR/$SUBDIR"
sh -c "$PREPARE" sh -c "$PREPARE"
meson setup --prefix=/usr _build "${MESON_OPTIONS[@]}" meson setup --prefix=/usr _build "${MESON_OPTIONS[@]}"
meson install -C _build meson install -C _build
popd popd
popd
rm -rf "$REPO_DIR"