diff --git a/.env.production b/.env.production index e67c7aae3624d404de5bb2442d86222a9a414427..28bcbbecec5b93a0ca2dd1b85fd949174ac096c9 100644 --- a/.env.production +++ b/.env.production @@ -2,3 +2,4 @@ NODE_ENV=production VUE_APP_VERSION_LABEL=Beta VUE_APP_ARTICLE_ENDPOINT='https://oda.uib.no/opal/prod/' VUE_APP_SEARCH_ENDPOINT='https://oda.uib.no/opal/prod/api/' +VUE_APP_VERSION_LABEL=DEV diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bd2dfd3a99b9993f1740b92777b21ef1f203469f..00eddac381d711ead823ef65af2fbd915de8a1ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,9 +24,9 @@ build-dev: script: - |- 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 + echo "VUE_APP_RELEASE=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 + echo "VUE_APP_RELEASE=BRANCH $CI_COMMIT_BRANCH ($CI_COMMIT_SHORT_SHA)" >> .env.dev_server fi - npm install --progress=false - npm run build -- --mode dev_server