From bcda50643c16e6e2d333946ee85d247f1057d40a Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Tue, 14 May 2024 13:56:52 +0200
Subject: [PATCH 1/3] Avoid leaking secrets when running in debug mode

---
 ci/build-helpers.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ci/build-helpers.sh b/ci/build-helpers.sh
index ad5a76c1..9913d8eb 100755
--- a/ci/build-helpers.sh
+++ b/ci/build-helpers.sh
@@ -182,7 +182,9 @@ function modtime () {
 function ensure_vars () {
   # Make sure variables are defined, and export them.
   for var in "$@"; do
-    if [ -z "${!var}" ]; then
+    # The +x is needed to avoid leaking secrets when running with
+    # bash -ex
+    if [ -z ${!var+x} ]; then
       echo "$(basename "$0"): error: required variable $var not defined!" >&2
       exit 1
     else

From 6ba85c4ac88aba9803e93129b12626746deccbb1 Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Tue, 14 May 2024 16:00:06 +0200
Subject: [PATCH 2/3] Bump slc9 to alibuild 1.17.1

---
 ci/repo-config/mesosci/slc9/o2-alidist.env | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/repo-config/mesosci/slc9/o2-alidist.env b/ci/repo-config/mesosci/slc9/o2-alidist.env
index 810986a1..51fefd28 100644
--- a/ci/repo-config/mesosci/slc9/o2-alidist.env
+++ b/ci/repo-config/mesosci/slc9/o2-alidist.env
@@ -5,6 +5,7 @@ PR_REPO=alisw/alidist
 PR_BRANCH=master
 NO_ASSUME_CONSISTENT_EXTERNALS=
 TRUST_COLLABORATORS=true
+INSTALL_ALIBUILD='alisw/alibuild@v1.17.1#egg=alibuild'
 CHECK_NAME=build/O2/alidist-slc9-x86
 DONT_USE_COMMENTS=1
 DEVEL_PKGS="$PR_REPO $PR_BRANCH

From 45d79a468c73fb13fc23e587447fbd65f6e70746 Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Wed, 15 May 2024 09:19:24 +0200
Subject: [PATCH 3/3] Publish build time dependencies

Apparently something (AliGenerators?) pulls them in as actual dependencies
---
 publish/aliPublish.conf | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/publish/aliPublish.conf b/publish/aliPublish.conf
index 648936f4..e2ab6947 100644
--- a/publish/aliPublish.conf
+++ b/publish/aliPublish.conf
@@ -343,6 +343,16 @@ architectures:
     RPM: false
     include:
       grid-base-packages: true
+      googlebenchmark: true
+      json-c: true
+      MPFR: true
+      ITSResponse: true
+      Python-modules-list: true
+      double-conversion: true
+      FairCMakeModules: true
+      Alice-GRID-Utils: true
+      abseil: true
+      bz2: true
       O2PDPSuite:
         - ^async-.*$
         # Tags for testing compatibility with Hyperloop.