Skip to content
Snippets Groups Projects

Updated rules

Merged Updated rules
rules_update into master
Merged Whitney Armstrong requested to merge rules_update into master
Compare
and
1 file
+ 2
− 0
Compare changes
  • Side-by-side
  • Inline
.gitlab-ci.yml
+ 2
− 0
@@ -32,6 +32,7 @@ compile:
@@ -32,6 +32,7 @@ compile:
docker_image:
docker_image:
image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
stage: container
stage: container
 
extends: .eicweb
rules:
rules:
- if: '$CI_COMMIT_BRANCH == "master" && $CI_SERVER_HOST == "eicweb.phy.anl.gov"'
- if: '$CI_COMMIT_BRANCH == "master" && $CI_SERVER_HOST == "eicweb.phy.anl.gov"'
script:
script:
@@ -41,6 +42,7 @@ docker_image:
@@ -41,6 +42,7 @@ docker_image:
docker_tag:
docker_tag:
image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
stage: container
stage: container
 
extends: .eicweb
rules:
rules:
- if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG'
- if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG'
script:
script: