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

New workflow

parent 0e338bb5
No related branches found
Tags release_2021-10-01_1
No related merge requests found
NODE_ENV=production
VUE_APP_VERSION_LABEL=DEVELOPMENT
VUE_APP_API_PREFIX=
......@@ -8,6 +8,7 @@ build-dev:
- spraaksamlingene_01
stage: build
script:
- echo "VUE_APP_VERSION_LABEL=$CI_COMMIT_BRANCH" >> .env.dev_server
- npm install --progress=false
- npm run build -- --mode dev_server
artifacts:
......@@ -36,8 +37,6 @@ deploy-dev:
tags:
- spraaksamlingene_01
stage: deploy
only:
- master
script:
- rm -rf ~/.aws
- mv .aws ~/
......
......@@ -34,3 +34,9 @@ radioknapper ved valget av målformen og ved navigeringen opp/ned i dropdown-men
til søkefeltet, men snarveien kan være forskjellig avhengig av nettleseren og operativsystemet. "Nøkkelbokstav" er "s": f.eks,
på Linux er det alt+s i Chrome og shift+alt+s i Firefox. En full oversikt over flere nettlesere og OS finnes i en tabell
her https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/accesskey
### Workflow
Create a merge request and merge your branch into master if and only if the issue is tagged as ready for prod.
Before submitting the merge request, you must pull any changes from the master branch, resolve merge conflicts and test the result on the dev server.
Deployment to dev server is now accessible on all branches. You can re-run deploy-dev without build-dev to deploy a particular branch to dev (within
the expiry date of 1 week).
\ No newline at end of file
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