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

Merge branch 'dev' into 'prod'

Dev

See merge request spraksamlingane/beta.ordbok.uib.no!104
parents 81aae198 df8f397d
No related branches found
No related tags found
No related merge requests found
......@@ -20,7 +20,7 @@ build-dev:
when: never
- if: $CI_COMMIT_REF_NAME == 'prod'
when: manual
- when: always
- when: on_success
script:
- |-
if [[ $CI_PIPELINE_SOURCE == "merge_request_event" ]]; then
......@@ -60,7 +60,7 @@ deploy-dev:
- if: $CI_COMMIT_TAG != null
when: never
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_PIPELINE_SOURCE == 'merge_request_event'
when: always
when: on_success
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE != 'merge_request_event'
when: manual
script:
......
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