Skip to content
Snippets Groups Projects
Commit 272ddc9b authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'master_lcg94' into 'master'

Switch master to LCG_94 (ATLINFR-2636)

See merge request atlas/athena!14289
parents 3ef508ae 4f4729a5
No related branches found
No related tags found
1 merge request!20779WIP: Migrate DataQualityTools to ToolHandles
......@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
AnalysisBaseExternalsVersion = 2.0.10
AnalysisBaseExternalsVersion = 2.0.11
# Versions of the various externals to build before starting the build of
# this project, when doing a full stack nightly build.
AnalysisBaseExternalsVersion = 2.0.10
AnalysisBaseExternalsVersion = 2.0.11
......@@ -5,4 +5,4 @@
# an "origin/" prefix before it. For tags however this is explicitly
# forbidden.
AtlasExternalsVersion = 2.0.10
AtlasExternalsVersion = 2.0.11
......@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
AthSimulationExternalsVersion = 2.0.10
AthSimulationExternalsVersion = 2.0.11
# The version of atlas/Gaudi to use:
GaudiVersion = v30r3.004
......@@ -24,9 +24,9 @@ if( LCG_NIGHTLY )
set( DQM-COMMON_VERSION "99-00-00" )
set( TDAQ_VERSION "99-00-00" )
else()
set( TDAQ-COMMON_VERSION "02-07-00" )
set( DQM-COMMON_VERSION "01-07-00" )
set( TDAQ_VERSION "08-00-00" )
set( TDAQ-COMMON_VERSION "02-09-00" )
set( DQM-COMMON_VERSION "01-09-00" )
set( TDAQ_VERSION "08-01-01" )
endif()
set( TDAQ-COMMON_ROOT
......
......@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
AthenaExternalsVersion = 2.0.10
AthenaExternalsVersion = 2.0.11
# The version of atlas/Gaudi to use:
GaudiVersion = v30r3.004
......@@ -9,11 +9,12 @@
- Projects/.*
# Remove most HLT packages
# We currently build the HLT as part of Athena. Uncomment the following three lines to revert:
#+ HLT/Trigger/TrigTransforms/TrigTransform
#- HLT/.*
#- Trigger/TrigValidation/TrigP1Test
+ HLT/Trigger/TrigTransforms/TrigTransform
- HLT/.*
- Trigger/TrigValidation/TrigP1Test
- HLT/HLToks
- Trigger/ALP
- Event/DFStreamEventSelector
# Offload service has build problems
- Offloading/.*
......@@ -26,7 +27,7 @@
- graphics/VP1/VP1Systems/VP12DGeometrySystems
- graphics/VP1/VP1Systems/VP1MCSystems
- graphics/VP1/VP1Systems/VP1TriggerDecisionSystems
+ graphics/VP1/.*
- graphics/VP1/.*
# Suspend building of Qat
- graphics/Qat/.*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment