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

ci: Fix checking out mutter for tag pipelines

Browse Source 
$CI_COMMIT_REF_NAME can be a branch name or a tag, depending on the
pipeline, but our checkout script only deals with the former at the
moment.

Address this by rather than looking for a remote branch name, just
try to fetch the ref like we do for merge request pipelines.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1529>
This commit is contained in:
Florian Müllner 2020-12-11 00:49:21 +01:00
parent 3cf35ce6df
commit 3cccd829f2
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitlab-ci/checkout-mutter.sh
View File

@ -1,5 +1,12 @@
#!/usr/bin/bash #!/usr/bin/bash
fetch() {
local remote=$1
local ref=$2
git fetch --quiet $remote $ref 2>/dev/null
}
mutter_target= mutter_target=
echo -n Cloning into mutter ... echo -n Cloning into mutter ...
@ -17,7 +24,7 @@ if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
merge_request_branch=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME merge_request_branch=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
echo -n Looking for $merge_request_branch on remote ... echo -n Looking for $merge_request_branch on remote ...
if git fetch -q $merge_request_remote $merge_request_branch 2>/dev/null; then if fetch $merge_request_remote $merge_request_branch; then
echo \ found echo \ found
mutter_target=FETCH_HEAD mutter_target=FETCH_HEAD
else else
@ -29,12 +36,12 @@ fi
if [ -z "$mutter_target" ]; then if [ -z "$mutter_target" ]; then
echo -n Looking for $CI_COMMIT_REF on remote ... echo -n Looking for $CI_COMMIT_REF on remote ...
mutter_target=$(git branch -r -l origin/$CI_COMMIT_REF_NAME) if fetch origin $CI_COMMIT_REF; then
if [ "$mutter_target" ]; then
echo \ found echo \ found
mutter_target=FETCH_HEAD
else else
echo \ not found echo \ not found
mutter_target=${mutter_target:-origin/master} mutter_target=origin/master
echo Using $mutter_target instead echo Using $mutter_target instead
fi fi
fi fi