Skip to content

Commit

Permalink
Merge branch 'RM-4344-bug-deploy-job-fail' into 'master'
Browse files Browse the repository at this point in the history
RM-4344: removed rule for mr, added rule for deploy tag

See merge request cdoc2/cdoc2-shares-server!8
  • Loading branch information
mir-jalal committed Nov 28, 2024
2 parents 03f5ed6 + 119512f commit 8df0fd7
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ variables:
alias: docker
tags:
- dind
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
when: on_success
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
when: on_success
- when: never
script:
- source load-env.sh
- cd shares-server
Expand Down Expand Up @@ -109,5 +103,10 @@ publish:server:
variables:
COMPONENT: shares-server
DOCKER_IMAGE_NAME: $DOCKER_REGISTRY/${COMPONENT}
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
when: on_success
- if: '$CI_COMMIT_TAG =~ /^.*deploy.*$/'
- when: never
extends:
- .publish-component

0 comments on commit 8df0fd7

Please sign in to comment.