diff --git a/.env.dev_server b/.env.dev_server index d78c51a208376954cc258f474ab06763a71ab314..ccec77e29305185dc1a60c846590210769a5e53c 100644 --- a/.env.dev_server +++ b/.env.dev_server @@ -1,3 +1,2 @@ NODE_ENV=production -VUE_APP_VERSION_LABEL=DEVELOPMENT VUE_APP_API_PREFIX= diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f695676f706a1eefd493701e450eb282cc295d7..6b19a66053c0ae60aa54e242a116bf3a6175e852 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 ~/ diff --git a/README.md b/README.md index fb127528fc029f1fb006f42e3696fe435c66ad9b..210d48655fde5a86831a33ba50611fc697fe99bb 100644 --- a/README.md +++ b/README.md @@ -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