Skip to content
Snippets Groups Projects
Commit ad7b529a authored by Henrik Askjer's avatar Henrik Askjer
Browse files

Merge branch 'dev' into menus-meta#428/#193

parents 162fc4db 46ed1785
No related branches found
No related tags found
No related merge requests found
......@@ -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
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment