Verified Commit 75b65da4 authored by Laurent Heirendt's avatar Laurent Heirendt
Browse files

update rules and exit

parent 496107df
...@@ -24,6 +24,7 @@ commit: ...@@ -24,6 +24,7 @@ commit:
entrypoint: [""] entrypoint: [""]
stage: deploy stage: deploy
rules: rules:
- if: $CI_MERGE_REQUEST_ID
- if: $CI_COMMIT_MESSAGE != "Merge branch 'tmpBranch' into build-ci" - if: $CI_COMMIT_MESSAGE != "Merge branch 'tmpBranch' into build-ci"
- if: $CI_COMMIT_MESSAGE != "Update models" - if: $CI_COMMIT_MESSAGE != "Update models"
before_script: before_script:
...@@ -39,5 +40,5 @@ commit: ...@@ -39,5 +40,5 @@ commit:
- git checkout $CI_COMMIT_REF_NAME - git checkout $CI_COMMIT_REF_NAME
- git pull origin $CI_COMMIT_REF_NAME - git pull origin $CI_COMMIT_REF_NAME
- git merge tmpBranch --ff - git merge tmpBranch --ff
- git push origin $CI_COMMIT_REF_NAME - git push origin $CI_COMMIT_REF_NAME || true
- git branch -D tmpBranch - git branch -D tmpBranch
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment