Skip to content
Snippets Groups Projects
Commit 0c8f5c3d authored by Mathias Goebel's avatar Mathias Goebel :reminder_ribbon:
Browse files

Merge branch 'develop'

parents bc8d837f 84abac02
No related branches found
No related tags found
No related merge requests found
Pipeline #215514 passed
Stage: pre-build
Stage: build
Stage: deploy_to_server
Stage: pages
Stage: preserve-pages
Stage: remove_unused_envs
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 5 deletions
.gitlab-ci.yml
+ 4
− 5
View file @ 0c8f5c3d
...@@ -14,11 +14,6 @@ ...@@ -14,11 +14,6 @@
dependencies: dependencies:
- install - install
script: script:
# test
- echo ${DEVELOP}
- echo ${VUE_APP_BASE_URL_API}
- echo $API_MAIN
- echo $VUE_APP_BASE_URL_VIEWER
# overwrite vars when build from main branch. to omit a second # overwrite vars when build from main branch. to omit a second
# job (see dependency in pages stage) when building for GitLab page. # job (see dependency in pages stage) when building for GitLab page.
- if [[ $CI_COMMIT_REF_SLUG == "main" && ${CI_JOB_NAME} != "build_page-main-backend" ]]; then - if [[ $CI_COMMIT_REF_SLUG == "main" && ${CI_JOB_NAME} != "build_page-main-backend" ]]; then
...@@ -26,6 +21,10 @@ ...@@ -26,6 +21,10 @@
- VUE_APP_BASE_URL_VIEWER=${MAIN} - VUE_APP_BASE_URL_VIEWER=${MAIN}
- VUE_APP_PUBLIC_PATH="/ahiqar/website/" - VUE_APP_PUBLIC_PATH="/ahiqar/website/"
- fi - fi
# test
- echo VUE_APP_BASE_URL_API=${VUE_APP_BASE_URL_API}
- echo VUE_APP_BASE_URL_VIEWER=${VUE_APP_BASE_URL_VIEWER}
- echo VUE_APP_PUBLIC_PATH=${VUE_APP_PUBLIC_PATH}
- npm run build - npm run build
- mkdir --parents public/${CI_COMMIT_REF_SLUG} - mkdir --parents public/${CI_COMMIT_REF_SLUG}
- cp --recursive src/.vuepress/dist/* public/${CI_COMMIT_REF_SLUG}/ - cp --recursive src/.vuepress/dist/* public/${CI_COMMIT_REF_SLUG}/
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment