Skip to content
Snippets Groups Projects
Commit a7b96d24 authored by Dave Casper's avatar Dave Casper
Browse files

Revert "Merge branch 'master' of https://gitlab.cern.ch:8443/faser/calypso" 

This reverts commit 4c9e84aa
parent 373c248f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 1
− 1
View file @ a7b96d24
...@@ -26,7 +26,7 @@ build_image: ...@@ -26,7 +26,7 @@ build_image:
- cd build - cd build
- set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh; set -e - set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh; set -e
- set +e && asetup --input=../../calypso/asetup.faser master,latest,Athena; set -e - set +e && asetup --input=../../calypso/asetup.faser master,latest,Athena; set -e
- cmake -DATLAS_PYTHON_CHECKER="" ../../calypso - cmake ../../calypso
- make -j - make -j
artifacts: artifacts:
paths: paths:
......
README.md
+ 1
− 3
View file @ a7b96d24
...@@ -15,8 +15,6 @@ asetup --input=calypso/asetup.faser master,latest,Athena ...@@ -15,8 +15,6 @@ asetup --input=calypso/asetup.faser master,latest,Athena
mkdir build mkdir build
cd build cd build
#build calypso #build calypso
cmake -DCMAKE_INSTALL_PREFIX=../run -DATLAS_PYTHON_CHECKER="" ../calypso ; make ; make install cmake -DCMAKE_INSTALL_PREFIX=../run ../calypso ; make ; make install
The ATLAS_PYTHON_CHECKER parameter to the cmake command is a temporary workaround for a problem with Flake
It can be convenient to alias the "asetup --input=calypso/asetup.faser" to something like "fsetup" It can be convenient to alias the "asetup --input=calypso/asetup.faser" to something like "fsetup"
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment