Skip to content
Snippets Groups Projects

fixing the variables for master

Merged fixing the variables for master
ci_master_trig into master
Merged Whitney Armstrong requested to merge ci_master_trig into master
Compare
and
1 file
+ 1
− 1
Compare changes
  • Side-by-side
  • Inline
.gitlab-ci.yml
+ 1
− 1
@@ -33,7 +33,7 @@ env:
@@ -33,7 +33,7 @@ env:
script:
script:
- export JUGGLER_DETECTOR="topside"
- export JUGGLER_DETECTOR="topside"
- |
- |
if [ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event" ]; then
if [[ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event" || "$CI_COMMIT_BRANCH" == "master" ]]; then
export JUGGLER_DETECTOR_VERSION="${CI_COMMIT_REF_NAME}"
export JUGGLER_DETECTOR_VERSION="${CI_COMMIT_REF_NAME}"
echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
echo "JUGGLER_DETECTOR_VERSION = ${CI_COMMIT_REF_NAME}"
echo "JUGGLER_DETECTOR_VERSION = ${CI_COMMIT_REF_NAME}"