Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
beta.ordbok.uib.no
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Margunn.Rauset
beta.ordbok.uib.no
Commits
8f6d9a81
Commit
8f6d9a81
authored
3 years ago
by
Henrik Askjer
Browse files
Options
Downloads
Patches
Plain Diff
New workflow
parent
0e338bb5
No related branches found
Branches containing commit
Tags
release_2021-10-01_1
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.env.dev_server
+0
-1
0 additions, 1 deletion
.env.dev_server
.gitlab-ci.yml
+1
-2
1 addition, 2 deletions
.gitlab-ci.yml
README.md
+6
-0
6 additions, 0 deletions
README.md
with
7 additions
and
3 deletions
.env.dev_server
+
0
−
1
View file @
8f6d9a81
NODE_ENV=production
VUE_APP_VERSION_LABEL=DEVELOPMENT
VUE_APP_API_PREFIX=
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
+
1
−
2
View file @
8f6d9a81
...
...
@@ -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 ~/
...
...
This diff is collapsed.
Click to expand it.
README.md
+
6
−
0
View file @
8f6d9a81
...
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment