diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2fe5b1b80abe91ec75962faee349dd3bbddf5d0b..9bc6e84e3c4e99eede71c15aeb874f027c99d1ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,13 +2,28 @@ stages: - build - deploy +workflow: + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS' + when: never + - if: '$CI_COMMIT_BRANCH' + build-dev: image: node:latest tags: - spraaksamlingene_01 stage: build + rules: + - if: $CI_COMMIT_TAG == null + when: always script: - - echo "VUE_APP_VERSION_LABEL=$CI_COMMIT_BRANCH" >> .env.dev_server + - |- + if [[ $CI_PIPELINE_SOURCE == "merge_request_event" ]]; then + echo "VUE_APP_VERSION_LABEL=MERGE $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME ($CI_COMMIT_SHORT_SHA)" >> .env.dev_server + else + echo "VUE_APP_VERSION_LABEL=BRANCH $CI_COMMIT_BRANCH ($CI_COMMIT_SHORT_SHA)" >> .env.dev_server + fi - npm install --progress=false - npm run build -- --mode dev_server artifacts: @@ -38,9 +53,9 @@ 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 + - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE != 'merge_request_event' when: manual script: - rm -rf ~/.aws diff --git a/src/App.vue b/src/App.vue index 5f4b5d32ab4df4c17cd22d96c5d344adaad937a5..36074cec8d16e1d19bf82af9d3c0a6c77080ed3a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -99,8 +99,9 @@ header > p { .beta { position: absolute; + white-space: nowrap; top: 2px; - font-size: 20px; + font-size: 18px; color: #BBBBBB; padding-left: 15px; }