diff --git a/.gitignore b/.gitignore index 555a2beb5b9b82f76bf2dabd227cb5e2e9af266a..c347b86104ffe490a049be365637f07c41c44a21 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ tmp.* .idea/** cmake-debug-build/** +.vscode/** diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77c6f8da06e2ebec97015907135231a53e91585e..2ea66e119261eeefee05057b7ff9d805615490f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,7 +41,7 @@ test_unittest: - yum -y install man - cd build - 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 Athena,22.0.18; set -e - set +e && source `find . -name 'setup.sh'`; set -e - ctest -j12 dependencies: