diff options
| author | Evan Welsh <contact@evanwelsh.com> | 2020-12-02 17:04:35 -0600 |
|---|---|---|
| committer | Evan Welsh <contact@evanwelsh.com> | 2020-12-02 17:10:54 -0600 |
| commit | 6cb8335d69a8af4293baf985a64f68e313577018 (patch) | |
| tree | f454c77c7432db3481a5ebf1644b3ca93bdb0fb8 | |
| parent | e76f9ae52ce940e83e47ce70aeda64069f8d572a (diff) | |
| download | gjs-ewlsh/fix-ci.tar.gz | |
ci: When finding common ancestors use source branch or commit branch.ewlsh/fix-ci
| -rwxr-xr-x | test/test-ci.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test-ci.sh b/test/test-ci.sh index c0ebe9ad..e61c3fe5 100755 --- a/test/test-ci.sh +++ b/test/test-ci.sh @@ -35,7 +35,7 @@ do_Get_Upstream_Base () { # should probably be rebased. git remote add upstream https://gitlab.gnome.org/GNOME/gjs.git || \ git remote set-url upstream https://gitlab.gnome.org/GNOME/gjs.git - base_branch="${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}" + base_branch="${CI_EXTERNAL_PULL_REQUEST_SOURCE_BRANCH_NAME:-${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-${CI_COMMIT_BRANCH:-${CI_DEFAULT_BRANCH}}}}" git fetch --shallow-since="14 days ago" --no-tags upstream "$base_branch" git branch ci-upstream-base-branch FETCH_HEAD |