From b1a29294e682caae6d00eb285226db85d0dea1a4 Mon Sep 17 00:00:00 2001
From: Ben Banfield-Zanin <benbz@matrix.org>
Date: Fri, 19 Feb 2021 16:15:05 +0000
Subject: [PATCH] Attempt to use nice ref names when possible

---
 .gitlab-ci.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8e50dae0d..0f6af0b885 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,14 +33,13 @@ docker-build:
   before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   - "[ -d './js-sdk' ] && rm -rf ./js-sdk"
-  - git clone --depth 1 --branch $JS_SDK_REF $JS_SDK_REPO js-sdk && cd js-sdk
-  - "export JS_SDK_SHA=$(git rev-parse --short=12 HEAD)"
-  - cd ../ && rm -rf js-sdk
+  - "[$JS_SDK_REF != 'master'] && git clone --depth 1 --branch $JS_SDK_REF $JS_SDK_REPO js-sdk && cd js-sdk && export JS_SDK_SHA=$(git rev-parse --short=12 HEAD) && cd ../ && rm -rf js-sdk"
+  - "[$JS_SDK_REF = 'master'] && export JS_SDK_SHA=master"
   - "[ -d './react-sdk' ] && rm -rf ./react-sdk"
-  - git clone --depth 1 --branch $REACT_SDK_BRANCH $REACT_SDK_REPO react-sdk && cd react-sdk
-  - "export REACT_SDK_SHA=$(git rev-parse --short=12 HEAD)"
-  - cd ../ && rm -rf react-sdk
-  - "export ELEMENT_WEB_SHA=$(git rev-parse --short=12 HEAD)"
+  - "[$REACT_SDK_BRANCH != 'master'] && git clone --depth 1 --branch $REACT_SDK_BRANCH $REACT_SDK_REPO react-sdk && cd react-sdk && export REACT_SDK_SHA=$(git rev-parse --short=12 HEAD) && cd ../ && rm -rf react-sdk"
+  - "[$REACT_SDK_BRANCH = 'master'] && export REACT_SDK_SHA=master"
+  - "[$CI_COMMIT_BRANCH != 'master'] && export ELEMENT_WEB_SHA=$(git rev-parse --short=12 HEAD)"
+  - "[$CI_COMMIT_BRANCH = 'master'] && export ELEMENT_WEB_SHA=master"
   - '[[ -z $SPECIAL_DOCKER_TAG ]] && export DOCKER_TAG="$CI_REGISTRY_IMAGE:$ELEMENT_WEB_SHA-react-$REACT_SDK_SHA-js-$JS_SDK_SHA" || export DOCKER_TAG="$SPECIAL_DOCKER_TAG"'
   script:
   - echo "Docker tag will be $DOCKER_TAG"