Attempt to make master build latest again
This commit is contained in:
parent
3faccf182e
commit
72596694af
1 changed files with 2 additions and 19 deletions
|
@ -1,5 +1,4 @@
|
||||||
stages:
|
stages:
|
||||||
- prepare
|
|
||||||
- build
|
- build
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
|
@ -9,24 +8,6 @@ variables:
|
||||||
REACT_SDK_REPO: "https://gitlab-ci-token:$GL_BAYERN_REACT_SDK_TOKEN@gitlab.matrix.org/new-vector/dataport/bayern-react-sdk"
|
REACT_SDK_REPO: "https://gitlab-ci-token:$GL_BAYERN_REACT_SDK_TOKEN@gitlab.matrix.org/new-vector/dataport/bayern-react-sdk"
|
||||||
REACT_SDK_BRANCH: "master"
|
REACT_SDK_BRANCH: "master"
|
||||||
|
|
||||||
prepare-master:
|
|
||||||
variables:
|
|
||||||
SPECIAL_DOCKER_TAG: "$CI_REGISTRY_IMAGE:latest"
|
|
||||||
stage: prepare
|
|
||||||
script:
|
|
||||||
- echo "Set SPECIAL_DOCKER_TAG to $SPECIAL_DOCKER_TAG"
|
|
||||||
rules:
|
|
||||||
- if: $CI_COMMIT_BRANCH == "master" && $REACT_SDK_BRANCH == "master" && $JS_SDK_REF == "master"
|
|
||||||
|
|
||||||
prepare-tags:
|
|
||||||
variables:
|
|
||||||
SPECIAL_DOCKER_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
|
|
||||||
stage: prepare
|
|
||||||
script:
|
|
||||||
- echo "Set SPECIAL_DOCKER_TAG to $SPECIAL_DOCKER_TAG"
|
|
||||||
rules:
|
|
||||||
- if: $CI_COMMIT_TAG
|
|
||||||
|
|
||||||
docker-build:
|
docker-build:
|
||||||
tags: ['shell']
|
tags: ['shell']
|
||||||
stage: build
|
stage: build
|
||||||
|
@ -40,6 +21,8 @@ docker-build:
|
||||||
- "[[ $REACT_SDK_BRANCH == 'master' ]] && export REACT_SDK_SHA=master"
|
- "[[ $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=$(git rev-parse --short=12 HEAD)"
|
||||||
- "[[ $CI_COMMIT_BRANCH == 'master' ]] && export ELEMENT_WEB_SHA=master"
|
- "[[ $CI_COMMIT_BRANCH == 'master' ]] && export ELEMENT_WEB_SHA=master"
|
||||||
|
- "[[ -v CI_COMMIT_TAG ]] && export SPECIAL_DOCKER_TAG=$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
|
||||||
|
- "[[ $CI_COMMIT_BRANCH == 'master' -a $REACT_SDK_BRANCH == 'master' -a $JS_SDK_REF == 'master' ]] && export SPECIAL_DOCKER_TAG=$CI_REGISTRY_IMAGE:latest"
|
||||||
- '[[ -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"'
|
- '[[ -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:
|
script:
|
||||||
- echo "Docker tag will be $DOCKER_TAG"
|
- echo "Docker tag will be $DOCKER_TAG"
|
||||||
|
|
Loading…
Add table
Reference in a new issue