From e28ff177f4ab9216a9413fb28cfe5e4656f33081 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Wed, 8 Dec 2021 20:40:12 +0000
Subject: [PATCH] .gitlab-ci.yml: bugfix for multi-line command
---
.gitlab-ci.yml | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e92ed913..40d1b0caf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -277,12 +277,10 @@ jug_xl:nightly:
- ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${NIGHTLY_TAG}
-n $DOCKER_NTRIES -t $DOCKER_WAIT_TIME
${NIGHTLY_TAG} ${PUSH_FLAG}
- - |
- if [ -z "${PUSH_FLAG}" ]; then
- ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${NIGHTLY_TAG}
- -n $DOCKER_NTRIES -t $DOCKER_WAIT_TIME
- ${NIGHTLY_TAG}-$(date +%Y-%m-%d) --dockerhub
- fi
+ - test -z "${PUSH_FLAG}" && ./gitlab-ci/docker_push.sh
+ -i ${BUILD_IMAGE} -l ${NIGHTLY_TAG}
+ -n $DOCKER_NTRIES -t $DOCKER_WAIT_TIME
+ ${NIGHTLY_TAG}-$(date +%Y-%m-%d) --dockerhub
jug_xl:feature:
extends: .build
@@ -320,12 +318,10 @@ jug_xl:feature:
- ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${INTERNAL_TAG}-${DETECTOR}-${DETECTOR_BRANCH}
-n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
${FEATURE_EXPORT_TAG} ${PUSH_FLAG}
- - |
- if [ -z "${PUSH_FLAG}" ]; then
- ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${INTERNAL_TAG}-${DETECTOR}-${DETECTOR_BRANCH}
- -n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
- ${FEATURE_EXPORT_TAG}-$(date +%Y-%m-%d) --dockerhub
- fi
+ - test -z "${PUSH_FLAG}" && ./gitlab-ci/docker_push.sh
+ -i ${BUILD_IMAGE} -l ${INTERNAL_TAG}-${DETECTOR}-${DETECTOR_BRANCH}
+ -n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
+ ${FEATURE_EXPORT_TAG}-$(date +%Y-%m-%d) --dockerhub
.singularity:
stage: deploy
--
GitLab