From f579727658b6fd9caffb2210c50277dd75240219 Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Wed, 9 Oct 2024 15:29:20 +0200
Subject: [PATCH 1/2] Remove explicit setting of
 GAUDI_TEST_PUBLIC_HEADERS_BUILD

It is enabled by default in LHCb builds as of lhcb-core/lcg-toolchains!152
---
 lhcbnightlyconf/Main.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lhcbnightlyconf/Main.py b/lhcbnightlyconf/Main.py
index 29c48248..8ab6273c 100644
--- a/lhcbnightlyconf/Main.py
+++ b/lhcbnightlyconf/Main.py
@@ -92,7 +92,6 @@ def create_head_slot(name,
 slots = []
 
 gaudi_head = create_head_slot('lhcb-gaudi-head')
-gaudi_head.cache_entries["GAUDI_TEST_PUBLIC_HEADERS_BUILD"] = True
 slots.append(gaudi_head)
 
 head = create_head_slot('lhcb-head')
-- 
GitLab


From d709c5695b8c38a6c70ca0cfafbe8c5c88c3b47f Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Wed, 9 Oct 2024 15:56:34 +0200
Subject: [PATCH 2/2] Disable Gaudi v20 compatibility

Needed to drop deprecated patterns and prepare for Gaudi v40.
---
 lhcbnightlyconf/Main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lhcbnightlyconf/Main.py b/lhcbnightlyconf/Main.py
index 8ab6273c..bf95dec5 100644
--- a/lhcbnightlyconf/Main.py
+++ b/lhcbnightlyconf/Main.py
@@ -92,6 +92,7 @@ def create_head_slot(name,
 slots = []
 
 gaudi_head = create_head_slot('lhcb-gaudi-head')
+gaudi_head.cache_entries["GAUDI_V21"] = True
 slots.append(gaudi_head)
 
 head = create_head_slot('lhcb-head')
-- 
GitLab