diff --git a/.env.dev_server b/.env.dev_server index 31573c1642cf525ffbcb86d3a26f5c3f8c3a6010..bc9b15ea7fb91e51878d4d677e4a3ae43ede17f5 100644 --- a/.env.dev_server +++ b/.env.dev_server @@ -1,3 +1,4 @@ NODE_ENV=production VUE_APP_ARTICLE_ENDPOINT='https://oda.uib.no/opal/dev/' VUE_APP_SEARCH_ENDPOINT='https://oda.uib.no/opal/dev/api/' +VUE_APP_VERSION_LABEL=DEVELOPMENT 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 diff --git a/package.json b/package.json index 0b6d0675479349b2f4d65e3442214c8c9de7e570..5db46df2a79379e9b70e8c34caea0ac321db436b 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "axios-cache-adapter": "^2.7.3", "core-js": "~3.6.5", "debounce": "^1.2.1", - "inflection-table": "https://git.app.uib.no/api/v4/projects/16442/jobs/artifacts/0.2.40/raw/module.tar.gz?job=publish", + "inflection-table": "https://git.app.uib.no/api/v4/projects/16442/jobs/artifacts/0.2.42/raw/module.tar.gz?job=publish", "vue": "^2.6.12", "vue-material-design-icons": "^4.11.0", "vue-plausible": "^1.1.4",