diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccc3aede..40bb7b56 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,6 +105,7 @@ executable: review: stage: deploy script: + - .gitlab/ci/enableGitlabReviewToolbar.sh www/index.html "$CI_PROJECT_ID" "$CI_OPEN_MERGE_REQUESTS" - ./node_modules/.bin/surge -p ./www -d https://$CI_PROJECT_PATH_SLUG-$CI_ENVIRONMENT_SLUG.surge.sh/ environment: name: review/$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_NAME @@ -112,6 +113,9 @@ review: on_stop: stop_review tags: - secrecy + except: + - master + - develop stop_review: stage: deploy diff --git a/.gitlab/ci/enableGitlabReviewToolbar.sh b/.gitlab/ci/enableGitlabReviewToolbar.sh new file mode 100755 index 00000000..9f4e3f1f --- /dev/null +++ b/.gitlab/ci/enableGitlabReviewToolbar.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env sh + +# Adds a preedefined script tag including the merge current request id to the angular web app index.html. +# This enables the interactive gitlab review toolbar. + +MERGE_REQUEST_ID="" +if echo -n $3 | grep -Eq '[0-9]+$'; then + MERGE_REQUEST_ID="$(echo -n "$3" | grep -Eo '[0-9]+$')" +fi + +SCRIPT_TAG="" +sed -i -e "\@@i\\$SCRIPT_TAG" $1 diff --git a/.gitlab/ci/getRegistryTag.sh b/.gitlab/ci/getRegistryTag.sh index d325ce19..29c0637a 100755 --- a/.gitlab/ci/getRegistryTag.sh +++ b/.gitlab/ci/getRegistryTag.sh @@ -1,8 +1,8 @@ #!/usr/bin/env sh -# script returns semantical versioning string linke 2.0.0 (if $1 is v2.0.0) or $1 -if echo -n $1 | grep -Eq 'v[0-9]+\.[0-9]+\.[0-9]+'; then +# script returns semantical versioning string like 2.0.0 (if $1 is v2.0.0) or $1 +if echo -n $1 | grep -Eq 'v[0-9]+\.[0-9]+\.[0-9]+'; then echo $(echo -n "$1" | cut -c 2-); -else +else echo $1; fi