Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
beta.ordbok.uib.no
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
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
Språksamlingane
beta.ordbok.uib.no
Commits
ad7b529a
Commit
ad7b529a
authored
3 years ago
by
Henrik Askjer
Browse files
Options
Downloads
Plain Diff
Merge branch 'dev' into menus-meta#428/#193
parents
162fc4db
46ed1785
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.env.production
+1
-0
1 addition, 0 deletions
.env.production
.gitlab-ci.yml
+2
-2
2 additions, 2 deletions
.gitlab-ci.yml
with
3 additions
and
2 deletions
.env.production
+
1
−
0
View file @
ad7b529a
...
...
@@ -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
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
+
2
−
2
View file @
ad7b529a
...
...
@@ -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
...
...
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