Lock CI back to master

dp466 · Jul 21, 2021 · 33edd64 · 33edd64
1 parent 1898670
commit 33edd64
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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";