From 33edd645c765ffed2951427c0ca0879fe41c4321 Mon Sep 17 00:00:00 2001
From: Elisabeth Kulzer <elikul@elikul.de>
Date: Wed, 21 Jul 2021 16:03:34 +0200
Subject: [PATCH] Lock CI back to master

---
 .circleci/config.yml              | 2 +-
 .gitlab-ci.yml                    | 2 +-
 scripts/download_mmctl_release.sh | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c512e195af..fe4898f4a0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,7 +25,7 @@ jobs:
           cd ../
           git clone --depth=1 --no-single-branch https://github.com/mattermost/mattermost-webapp.git
           cd mattermost-webapp
-          git checkout $CIRCLE_BRANCH || git checkout release-6.0
+          git checkout $CIRCLE_BRANCH || git checkout master
           export WEBAPP_GIT_COMMIT=$(git rev-parse HEAD)
           echo "$WEBAPP_GIT_COMMIT"
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a306e8849..562660978a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
 
 include:
   - project: mattermost/ci/mattermost-server
-    ref: release-6.0
+    ref: master
     file: private.yml
 
 variables:
diff --git a/scripts/download_mmctl_release.sh b/scripts/download_mmctl_release.sh
index bd54cb86f9..2862f15dc4 100755
--- a/scripts/download_mmctl_release.sh
+++ b/scripts/download_mmctl_release.sh
@@ -15,7 +15,14 @@ fi
 
 BIN_PATH=${2:-bin}
 
-RELEASE_TO_DOWNLOAD="release-6.0"
+# strip whitespace
+THIS_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+if [[ "$THIS_BRANCH" =~ 'release-'[0-9] ]];
+then
+  RELEASE_TO_DOWNLOAD="$THIS_BRANCH"
+else
+  RELEASE_TO_DOWNLOAD=master
+fi
 
 echo "Downloading prepackaged binary: https://releases.mattermost.com/mmctl/$RELEASE_TO_DOWNLOAD";