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

Merge branch 'dev' of git.app.uib.no:spraksamlingane/beta.ordbok.uib.no into inflected-search

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