From 81e8f9dca1123153f87f9394904febe5c26e9690 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 13 Jan 2021 21:06:13 +0100
Subject: [PATCH] [ci] Enabled container job on release branch.
---
scripts/ci/jobs/container.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/ci/jobs/container.yml b/scripts/ci/jobs/container.yml
index d340de5d806..6cba746449a 100644
--- a/scripts/ci/jobs/container.yml
+++ b/scripts/ci/jobs/container.yml
@@ -7,18 +7,20 @@ container:
- if: $CI_COMMIT_TAG
- changes:
- scripts/ci/jobs/container.yml
+ - if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/
- when: manual
allow_failure: true
extends:
- .container-maker-setup
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+ - if [[ "$CI_COMMIT_BRANCH" == "master" ]] ;then export DOCKER_TAG="--tag $CI_REGISTRY/ogs/$CI_PROJECT_NAME/ogs-serial:latest" ; fi
- >
poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../..
--build_args ' --progress=plain'
--pm system --cvode --ccache
--cmake_args ' -DBUILD_TESTING=OFF -DOGS_BUILD_UTILS=ON -DOGS_USE_PYTHON=ON'
- --tag $CI_REGISTRY/ogs/$CI_PROJECT_NAME/ogs-serial:latest --upload
+ $DOCKER_TAG
- >
poetry run ogscm compiler.py mpi.py ogs.py -B -C -R --ogs ../..
--build_args ' --progress=plain'
--
GitLab