diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b8c967f8de37cc439828dd960975b1e1b9a37f75..cbfe9da95e3beb497fd44a7035a026c36062463e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,9 +28,8 @@ alma8: - PLATFORM: - alma8 LCG_VERSION: - - dev3 - - dev3cuda - - dev4cuda + - 106a + - 106a_cuda alma9: <<: *retry_policy @@ -51,12 +50,9 @@ alma9: - PLATFORM: - alma9 LCG_VERSION: - - dev3 - - dev4 - - dev3lhcb - - dev4lhcb - - devswan - - devAdePT + - 106a + - 106a_swan + - 106a_cuda ubuntu: <<: *retry_policy @@ -76,8 +72,8 @@ ubuntu: - ubuntu20 - ubuntu22 LCG_VERSION: - - dev4 - - dev4cuda + - 106a + - 106a_cuda special: <<: *retry_policy @@ -95,19 +91,19 @@ special: parallel: matrix: - LCG_VERSION: - - dev4 + - 106a BINARY_TAG: "arm64-mac12-clang140-opt" LCG_HOST_OS: "mac" LCG_HOST_OSVERS: "12" IS_APPLE: "ON" - LCG_VERSION: - - dev4 + - 106a BINARY_TAG: "arm64-mac13-clang140-opt" LCG_HOST_OS: "mac" LCG_HOST_OSVERS: "12" IS_APPLE: "ON" - LCG_VERSION: - - dev4 + - 106a BINARY_TAG: "aarch64-el9-gcc13-opt" LCG_HOST_OS: "alma" LCG_HOST_OSVERS: "9" diff --git a/cmake/toolchain/heptools-dev4.cmake b/cmake/toolchain/heptools-106a.cmake similarity index 100% rename from cmake/toolchain/heptools-dev4.cmake rename to cmake/toolchain/heptools-106a.cmake diff --git a/cmake/toolchain/heptools-dev4cuda.cmake b/cmake/toolchain/heptools-106a_cuda.cmake similarity index 80% rename from cmake/toolchain/heptools-dev4cuda.cmake rename to cmake/toolchain/heptools-106a_cuda.cmake index e405a9b3440f103335558a7f28bc46adc1a67561..d92503fbd217ad226952e0e272cbd752d6bddee1 100644 --- a/cmake/toolchain/heptools-dev4cuda.cmake +++ b/cmake/toolchain/heptools-106a_cuda.cmake @@ -1,3 +1,3 @@ #---List of externals---------------------------------------------- -include(heptools-dev4) +include(heptools-106a) include(cuda_package_config) diff --git a/cmake/toolchain/heptools-devswan.cmake b/cmake/toolchain/heptools-106a_swan.cmake similarity index 98% rename from cmake/toolchain/heptools-devswan.cmake rename to cmake/toolchain/heptools-106a_swan.cmake index 66b75f6f2384342da8b17d6692de3ba7fd6dcfc7..d5370a0f0dc6a2b7f0de109fbf217bf3e885d25b 100644 --- a/cmake/toolchain/heptools-devswan.cmake +++ b/cmake/toolchain/heptools-106a_swan.cmake @@ -1,6 +1,6 @@ #---List of externals set(LCG_PYTHON_VERSION 3) -include(heptools-dev3) +include(heptools-106a) LCG_external_package(java 11.0.24p8 ) diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake index d8f200284789706c80729778653d4a22daaa95a2..3d1891a478c4c9e0253f3786c2814481278e1917 100644 --- a/cmake/toolchain/heptools-dev-base.cmake +++ b/cmake/toolchain/heptools-dev-base.cmake @@ -9,7 +9,9 @@ LCG_AA_project(HepMC 2.06.11) LCG_AA_project(Geant4 11.2.2) LCG_AA_project(Geant4-vecgeom-scalar 11.2.0) -LCG_AA_project(Garfield++ HEAD GIT=https://gitlab.cern.ch/garfield/garfieldpp.git) +#LCG_AA_project(Garfield++ HEAD GIT=https://gitlab.cern.ch/garfield/garfieldpp.git) +# commit from September 26 +LCG_AA_project(Garfield++ 9d53f104) if(${LCG_OS}${LCG_OSVERS} MATCHES centos|ubuntu|el) if(((${LCG_COMP} MATCHES gcc) AND (${LCG_COMPVERS} GREATER 9)) OR (${LCG_COMP} MATCHES clang)) LCG_AA_project(Gaudi v38r3 GIT=https://gitlab.cern.ch/gaudi/Gaudi.git) diff --git a/cmake/toolchain/heptools-macos.cmake b/cmake/toolchain/heptools-macos.cmake index 4b640a3365ee0a350768d3668eb8b02a4308983d..521801aacd94241840bd447555949c8e9af72edc 100644 --- a/cmake/toolchain/heptools-macos.cmake +++ b/cmake/toolchain/heptools-macos.cmake @@ -79,6 +79,7 @@ if(APPLE) if(LCG_ARCH MATCHES arm64) LCG_remove_package(nlox) + LCG_remove_package(ginac) LCG_remove_package(gosam) LCG_remove_package(gosam_contrib) LCG_remove_package(madgraph5amc)