Fixing the CI

modified: .gitlab-ci.yml

.gitlab-ci.yml

@@ -11,12 +11,10 @@ workflow:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
     - if: '$CI_PIPELINE_SOURCE == "web"'
     - if: '$CI_PIPELINE_SOURCE == "webide"'
-    - if: '$CI_COMMIT_BRANCH == "master"'
+    - if: '$CI_COMMIT_BRANCH == "main"'
     - if: '$CI_COMMIT_TAG'
 
 default:
-  before_script:
-    - source .local/bin/env.sh
   artifacts:
     expire_in: 72 hours
     paths:
@@ -50,7 +48,6 @@ common:setup:
     - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
   before_script:
     - git clone https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup
-      source .local/bin/env.sh
   script:
     - |
       if [[ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event"  || "$CI_COMMIT_BRANCH" == "master" ]]; then
@@ -62,6 +59,7 @@ common:setup:
         echo "BEAMLINE_VERSION=$CI_COMMIT_REF_NAME" >> detector.env
         echo "BEAMLINE=$BEAMLINE" >> detector.env
         echo "DETECTOR=$DETECTOR" >> detector.env
+        echo "DETECTOR_VERSION=$DETECTOR_VERSION" >> detector.env
         # if specific juggler version is requested
         if [[ -n "${JUGGLER_DETECTOR_VERSION}" ]]; then
           echo "JUGGLER_DETECTOR_VERSION = ${CI_COMMIT_REF_NAME}"
@@ -69,6 +67,7 @@ common:setup:
         fi
       fi
     - |
+      source setup/bin/env.sh && ./setup/bin/install_common.sh
       source .local/bin/env.sh
       mkdir -p build && cd build && cmake ../. -DCMAKE_INSTALL_PREFIX=${LOCAL_PREFIX} && make -j20  || exit -1
       make install  && cd ..
@@ -80,7 +79,7 @@ common:detector:
   stage: initialize
   needs: ["common:setup"]
   script:
-    - source .local/bin/env.sh #&& build_detector.sh
+    - source .local/bin/env.sh
     - mkdir_local_data_link sim_output
     - mkdir -p results
     - mkdir -p config
@@ -106,6 +105,7 @@ dump_constants:
   needs:
     - ["common:detector"]
   script:
+    - source .local/bin/env.sh
     - npdet_info dump ip8.xml  | tee doc/constants.out
 
 dump_geometry:
@@ -113,16 +113,18 @@ dump_geometry:
   needs:
     - common:detector
   script:
-   - echo "dumping geometry"
-   - mkdir -p geo
-   - dd_web_display --output geo/detector_geo_full.root ip8.xml
-   - echo "Geometry viewer at https://eic.phy.anl.gov/geoviewer/index.htm?file=https://eicweb.phy.anl.gov/EIC/detectors/ip8/-/jobs/${CI_JOB_ID}/artifacts/raw/geo/detector_geo_full.root?job=dump_geometry&item=default;1&opt=transp30;zoom75;ROTY290;ROTZ350;trz0;trr0;ctrl;all&"
+    - source .local/bin/env.sh
+    - echo "dumping geometry"
+    - mkdir -p geo
+    - dd_web_display --output geo/detector_geo_full.root ip8.xml
+    - echo "Geometry viewer at https://eic.phy.anl.gov/geoviewer/index.htm?file=https://eicweb.phy.anl.gov/EIC/detectors/ip8/-/jobs/${CI_JOB_ID}/artifacts/raw/geo/detector_geo_full.root?job=dump_geometry&item=default;1&opt=transp30;zoom75;ROTY290;ROTZ350;trz0;trr0;ctrl;all&"
 
 xmllint:
   stage: test
   needs:
     - ["common:detector"]
   script:
+    - source .local/bin/env.sh
     - xmllint ip8/*.xml ip8.xml > /dev/null
 
 overlap_check:
@@ -130,6 +132,7 @@ overlap_check:
   needs:
     - ["common:detector"]
   script:
+    - source .local/bin/env.sh
     - checkOverlaps -c ip8.xml
 
 overlap_check_geant4:
@@ -137,6 +140,8 @@ overlap_check_geant4:
   needs:
     - ["common:detector"]
   script:
+    - source .local/bin/env.sh && ./.local/bin/print_env.sh
+    - ls -lrth && pwd
     - python scripts/checkOverlaps.py -c ip8.xml | tee doc/overlap_check_geant4.out
     - echo "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l) overlaps..."
     - if [[ "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi