Skip to content
Snippets Groups Projects
Commit 63cdbd65 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

modified: .gitlab-ci.yml

	modified:   CMakeLists.txt
parent f16a07b5
No related branches found
No related tags found
No related merge requests found
Pipeline #7338 failed
...@@ -31,7 +31,7 @@ stages: ...@@ -31,7 +31,7 @@ stages:
env: env:
stage: config stage: config
script: script:
- export JUGGLER_DETECTOR="detector_template" - export JUGGLER_DETECTOR="reference_detector"
- | - |
if [[ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event" || "$CI_COMMIT_BRANCH" == "master" ]]; 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}"
...@@ -89,7 +89,7 @@ overlap_check: ...@@ -89,7 +89,7 @@ overlap_check:
needs: needs:
- ["compile"] - ["compile"]
script: script:
- checkOverlaps -c detector_template.xml | tee doc/overlap_check.out - checkOverlaps -c reference_detector.xml | tee doc/overlap_check.out
- echo "$(cat doc/overlap_check.out | grep ovlp | wc -l) overlaps..." - echo "$(cat doc/overlap_check.out | grep ovlp | wc -l) overlaps..."
- if [[ "$(cat doc/overlap_check.out | grep ovlp | wc -l)" -gt "1" ]] ; then echo "Overlaps exist!" && false ; fi - if [[ "$(cat doc/overlap_check.out | grep ovlp | wc -l)" -gt "1" ]] ; then echo "Overlaps exist!" && false ; fi
...@@ -98,7 +98,7 @@ detector:config_testing: ...@@ -98,7 +98,7 @@ detector:config_testing:
needs: needs:
- ["compile"] - ["compile"]
script: script:
- checkOverlaps -c detector_template.xml | tee doc/overlap_check.out | wc -l - checkOverlaps -c reference_detector.xml | tee doc/overlap_check.out | wc -l
- cat doc/overlap_check.out - cat doc/overlap_check.out
allow_failure: true allow_failure: true
......
cmake_minimum_required(VERSION 3.3 FATAL_ERROR) cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
PROJECT(detector_template PROJECT(reference_detector
VERSION 0.0.1 VERSION 0.0.1
LANGUAGES CXX LANGUAGES CXX
DESCRIPTION "A template dd4hep+acts detector" DESCRIPTION "A template dd4hep+acts detector"
...@@ -11,7 +11,7 @@ find_package( DD4hep REQUIRED COMPONENTS DDCore DDG4 ) ...@@ -11,7 +11,7 @@ find_package( DD4hep REQUIRED COMPONENTS DDCore DDG4 )
#find_package(Acts REQUIRED COMPONENTS Core PluginIdentification PluginTGeo PluginDD4hep ) #find_package(Acts REQUIRED COMPONENTS Core PluginIdentification PluginTGeo PluginDD4hep )
#----------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------
set(a_lib_name detector_template) set(a_lib_name reference_detector)
if("${PROJECT_NAME}" STREQUAL "detector_template") if("${PROJECT_NAME}" STREQUAL "detector_template")
message(WARNING " message(WARNING "
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment