diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb29fed9c944cd0ae0d373cb1c8da6a6b0c11d30..1e10a1d593dd96bfd4cdabcc03020f4c53939235 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: eicweb.phy.anl.gov:4567/containers/eic_container/jug_xl:master +image: eicweb.phy.anl.gov:4567/containers/eic_container/jug_xl:nightly variables: BEAMLINE: "ip8" @@ -12,7 +12,7 @@ workflow: - if: '$CI_PIPELINE_SOURCE == "web"' - if: '$CI_PIPELINE_SOURCE == "webide"' - if: '$CI_COMMIT_BRANCH == "master"' - - if: '$CI_COMMIT_BRANCH == "acadia"' + - if: '$CI_COMMIT_BRANCH == "main"' - if: '$CI_COMMIT_TAG' default: @@ -52,7 +52,6 @@ common:setup: before_script: - git clone https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup script: - - export DETECTOR="DII" - | if [[ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event" || "$CI_COMMIT_BRANCH" == "master" ]] ; then export DETECTOR_VERSION="${CI_COMMIT_REF_NAME}"