Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
ecce
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIC
detectors
ecce
Commits
31a582fe
You need to sign in or sign up before continuing.
Commit
31a582fe
authored
2 years ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
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
!51
New github workflows: convert geometry etc, artifacts
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.github/workflows/linux-eic-shell.yml
+4
-4
4 additions, 4 deletions
.github/workflows/linux-eic-shell.yml
with
4 additions
and
4 deletions
.github/workflows/linux-eic-shell.yml
+
4
−
4
View file @
31a582fe
...
@@ -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 "
O
verlaps
exist
!" && false ; fi
if [[ "$
{noverlaps}
" -gt "0" ]] ; then echo "
${no
verlaps
} 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 "
O
verlaps
exist
!" && false ; fi
if [[ "$
{noverlaps}
" -gt "0" ]] ; then echo "
${no
verlaps
} overlaps found
!" && false ; fi
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment