diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2019-11-07 00:05:12 +0100 |
|---|---|---|
| committer | Florian Müllner <fmuellner@gnome.org> | 2019-11-07 00:14:41 +0100 |
| commit | 4ba3c4537e30cdd500286f57b9716e168ad54250 (patch) | |
| tree | dae322ed6f9b789fe18f76f5a2238d5b71683ce0 | |
| parent | 1f56514e40855293b59eccf58ae6acf7bf37181e (diff) | |
| download | mutter-4ba3c4537e30cdd500286f57b9716e168ad54250.tar.gz | |
ci: Fix checking out gnome-shell on stable branches
For stable branches, we currently only check out the correct shell
branch for merge requests. For the regular pipeline, our code to
determine the current mutter branch fails because CI runs on a
temporary "pipeline/12345" branch that doesn't exist for gnome-shell.
Switching to the correct gitlab environment variable fixes that.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/811
| -rwxr-xr-x | .gitlab-ci/checkout-gnome-shell.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab-ci/checkout-gnome-shell.sh b/.gitlab-ci/checkout-gnome-shell.sh index 64c1af953..bcfbfe7a7 100755 --- a/.gitlab-ci/checkout-gnome-shell.sh +++ b/.gitlab-ci/checkout-gnome-shell.sh @@ -1,6 +1,5 @@ #!/usr/bin/bash -mutter_branch=$(git describe --contains --all HEAD) gnome_shell_target= git clone https://gitlab.gnome.org/GNOME/gnome-shell.git @@ -26,8 +25,7 @@ if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then fi if [ -z "$gnome_shell_target" ]; then - gnome_shell_target=$(git branch -r -l origin/$mutter_branch) - gnome_shell_target=${gnome_shell_target:-$(git branch -r -l ${mutter_branch#remotes/})} + gnome_shell_target=$(git branch -r -l origin/$CI_COMMIT_REF_NAME) gnome_shell_target=${gnome_shell_target:-origin/master} echo Using $gnome_shell_target instead fi |