diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index befdd9b77980cbf627d8b612f207af1bb870b8bd..d2b70cf380e60611d422e5fde2e37c3efd9ffcfa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,8 @@ build-dev: - if: $CI_COMMIT_TAG == null when: always script: + - echo $CI_COMMIT_BRANCH + - echo $CI_PIPELINE_SOURCE - echo "VUE_APP_VERSION_LABEL=$CI_COMMIT_BRANCH" >> .env.dev_server - npm install --progress=false - npm run build -- --mode dev_server @@ -41,9 +43,8 @@ deploy-dev: - spraaksamlingene_01 stage: deploy rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_PIPELINE_SOURCE == "merge_request_event" when: always - - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH when: manual script: - rm -rf ~/.aws