Merge pull request #179 from crf-devs/protect_tag_build

Protect tag builds
crf-devs · Mar 29, 2020 · d037161 · d037161
2 parents 0177ab3 + 2f92e8e
commit d037161
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -77,8 +77,9 @@ build:master:
 build:tag:
   extends: .build
   after_script:
-    - test -z "$CI_COMMIT_TAG" && echo "This is not a tag pipeline" && exit 0
+    - test -z "$CI_COMMIT_TAG" && echo "This is not a tag pipeline" && exit 1
     - echo "Tag => $CI_COMMIT_TAG"
+    - git branch --contains $(git rev-list -n 1 ${CI_COMMIT_TAG}) --format "%(refname:short)" | grep '^master$' || (echo "The tag is not present on master" && exit 1)
     - docker tag ${CI_REGISTRY_IMAGE}/fpm:${CI_COMMIT_REF_SLUG} ${CI_REGISTRY_IMAGE}/fpm:release-latest && docker push ${CI_REGISTRY_IMAGE}/fpm:release-latest
     - docker tag ${CI_REGISTRY_IMAGE}/nginx:${CI_COMMIT_REF_SLUG} ${CI_REGISTRY_IMAGE}/nginx:release-latest && docker push ${CI_REGISTRY_IMAGE}/nginx:release-latest
   only: