From 6faf6f8c51a750c8b80382480a87ffc7c8c52dfe Mon Sep 17 00:00:00 2001
From: Savannah Rose Shively <savannah.rose.shively@cern.ch>
Date: Fri, 9 Oct 2020 21:42:02 +0200
Subject: [PATCH] gitignore update
---
.gitignore | 1 +
.gitlab-ci.yml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 555a2beb..c347b861 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 77c6f8da..2ea66e11 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:
--
GitLab