[gjs/revert-6ce45bb3] Revert "Merge branch 'ewlsh/fix-ci' into 'master'"

[Evan Welsh <ewlsh src gnome org>]

commit 6fb72fd659ca0ffbb4a1df89393edb0d7b53a18f
Author: Evan Welsh <noreply evanwelsh com>
Date:   Thu Dec 3 00:07:45 2020 +0000

    Revert "Merge branch 'ewlsh/fix-ci' into 'master'"
    
    This reverts merge request !544

 test/test-ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/test/test-ci.sh b/test/test-ci.sh
index e61c3fe5..c0ebe9ad 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_EXTERNAL_PULL_REQUEST_SOURCE_BRANCH_NAME:-${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-${CI_COMMIT_BRANCH:-${CI_DEFAULT_BRANCH}}}}"
+    base_branch="${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}"
     git fetch --shallow-since="14 days ago" --no-tags upstream "$base_branch"
     git branch ci-upstream-base-branch FETCH_HEAD