Skip to content
Snippets Groups Projects
Commit 31a582fe authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

fix: grep returns $? non-zero if no match, which fails set -e

parent 1d9e2581
No related branches found
No related tags found
1 merge request!51New github workflows: convert geometry etc, artifacts
...@@ -95,8 +95,8 @@ jobs: ...@@ -95,8 +95,8 @@ jobs:
sed -i '/<fiber/,+6d' ${DETECTOR_PATH}/compact/ecal_barrel_interlayers.xml sed -i '/<fiber/,+6d' ${DETECTOR_PATH}/compact/ecal_barrel_interlayers.xml
sed -i '/<fiber/,+4d' ${DETECTOR_PATH}/ip6/far_forward/ZDC_Ecal_WSciFi.xml sed -i '/<fiber/,+4d' ${DETECTOR_PATH}/ip6/far_forward/ZDC_Ecal_WSciFi.xml
checkOverlaps -c ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml | tee doc/overlap_check_tgeo.out checkOverlaps -c ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml | tee doc/overlap_check_tgeo.out
echo "$(cat doc/overlap_check_tgeo.out | grep ovlp | wc -l) overlaps..." noverlaps="$(grep -c ovlp doc/overlap_check_tgeo.out || true)"
if [[ "$(cat doc/overlap_check_tgeo.out | grep ovlp | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi if [[ "${noverlaps}" -gt "0" ]] ; then echo "${noverlaps} overlaps found!" && false ; fi
check-overlap-geant4: check-overlap-geant4:
runs-on: ubuntu-latest runs-on: ubuntu-latest
...@@ -117,5 +117,5 @@ jobs: ...@@ -117,5 +117,5 @@ jobs:
sed -i '/<fiber/,+6d' ${DETECTOR_PATH}/compact/ecal_barrel_interlayers.xml sed -i '/<fiber/,+6d' ${DETECTOR_PATH}/compact/ecal_barrel_interlayers.xml
sed -i '/<fiber/,+4d' ${DETECTOR_PATH}/ip6/far_forward/ZDC_Ecal_WSciFi.xml sed -i '/<fiber/,+4d' ${DETECTOR_PATH}/ip6/far_forward/ZDC_Ecal_WSciFi.xml
python scripts/checkOverlaps.py -c ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml | tee doc/overlap_check_geant4.out python scripts/checkOverlaps.py -c ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml | tee doc/overlap_check_geant4.out
echo "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l) overlaps..." noverlaps="$(grep -c GeomVol1002 doc/overlap_check_geant4.out || true)"
if [[ "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi if [[ "${noverlaps}" -gt "0" ]] ; then echo "${noverlaps} overlaps found!" && false ; fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment