Merge 36277e4 into sapling-pr-archive-ktf

ktf · Sep 27, 2024 · 756494f · 756494f
2 parents c95490f + 36277e4
commit 756494f
Show file tree

Hide file tree

Showing 22 changed files with 34 additions and 33 deletions.
diff --git a/.github/workflows/prepare-patch-release-branch.yml b/.github/workflows/prepare-patch-release-branch.yml
@@ -21,7 +21,7 @@ jobs:
         id: decide_release_branch
         run: |
           case "$TAG" in
-            v5-09-59*) echo branch=master ;;
+            v5-09-60*) echo branch=master ;;
             *) echo "branch=$(echo "AliPhysics-$TAG-01-patches" | sed -r 's/[a-z]+-01-patches$/-01-patches/')" ;;
           esac >> "$GITHUB_OUTPUT"
         env:

diff --git a/aegis.sh b/aegis.sh
@@ -1,6 +1,6 @@
 package: AEGIS
 version: "%(tag_basename)s"
-tag: v1.5.3-alice2
+tag: v1.5.3
 requires:
   - ROOT
   - VMC

diff --git a/arrow.sh b/arrow.sh
@@ -5,7 +5,7 @@ source: https://github.com/alisw/arrow.git
 requires:
   - boost
   - lz4
-  - Clang:(?!.*osx)
+  - Clang
   - protobuf
   - utf8proc
   - OpenSSL:(?!osx)
@@ -19,6 +19,7 @@ build_requires:
   - double-conversion
   - re2
   - alibuild-recipe-tools
+  - ninja
 env:
   ARROW_HOME: "$ARROW_ROOT"
 ---
@@ -58,17 +59,12 @@ esac
 
 mkdir -p ./src_tmp
 rsync -a --exclude='**/.git' --delete --delete-excluded "$SOURCEDIR/" ./src_tmp/
-
 case $ARCHITECTURE in
   osx*)
-   # use default llvm from homebrew if available
-   if [ -d "$(brew --prefix llvm)" ]; then
-     CLANG_EXECUTABLE="$(brew --prefix llvm)/bin/clang"
-   else
-     # fall back to llvm@17
-     if [ -d "$(brew --prefix llvm)@17" ]; then
-       CLANG_EXECUTABLE="$(brew --prefix llvm)@17/bin/clang"
-     fi
+   # use compatible llvm@18 from brew, if available. This
+   # must match the prefer_system_check in clang.sh
+   if [ -d "$(brew --prefix llvm)@18" ]; then
+     CLANG_EXECUTABLE="$(brew --prefix llvm)@18/bin/clang"
    fi
    ;;
   *)
@@ -81,6 +77,7 @@ esac
 cmake ./src_tmp/cpp                                                                                 \
       ${CMAKE_SHARED_LINKER_FLAGS:+-DCMAKE_SHARED_LINKER_FLAGS="$CMAKE_SHARED_LINKER_FLAGS"}        \
       -DARROW_DEPENDENCY_SOURCE=SYSTEM                                                              \
+      -G Ninja                                                                                      \
       -DCMAKE_BUILD_TYPE=Release                                                                    \
       ${CXXSTD:+-DCMAKE_CXX_STANDARD=$CXXSTD}                                                       \
       -DBUILD_SHARED_LIBS=TRUE                                                                      \
@@ -125,8 +122,7 @@ cmake ./src_tmp/cpp
       -DCLANG_EXECUTABLE="$CLANG_EXECUTABLE"                                                        \
       ${GCC_TOOLCHAIN_REVISION:+-DGCC_TOOLCHAIN_ROOT=`find "$GCC_TOOLCHAIN_ROOT/lib" -name crtbegin.o -exec dirname {} \;`}
 
-make ${JOBS:+-j $JOBS}
-make install
+cmake --build . -- ${JOBS:+-j $JOBS} install
 find "$INSTALLROOT/share" -name '*-gdb.py' -exec mv {} "$INSTALLROOT/lib" \;
 
 # Modulefile

diff --git a/clang.sh b/clang.sh
@@ -12,6 +12,9 @@ build_requires:
   - ninja
 env:
   LLVM_ROOT: "$CLANG_ROOT" # needed by LLVMAlt
+prefer_system: (osx.*)
+prefer_system_check:
+  test -d $(brew --prefix llvm@18)
 ---
 #!/bin/bash -e
 

diff --git a/coconut.sh b/coconut.sh
@@ -1,6 +1,6 @@
 package: coconut
 version: "%(tag_basename)s"
-tag: "v1.19.1"
+tag: "v1.20.0"
 build_requires:
   - golang
   - protobuf

diff --git a/common-o2.sh b/common-o2.sh
@@ -1,6 +1,6 @@
 package: Common-O2
 version: "%(tag_basename)s"
-tag: v1.6.2
+tag: v1.6.3
 requires:
   - boost
   - "GCC-Toolchain:(?!osx)"

diff --git a/control-core.sh b/control-core.sh
@@ -1,6 +1,6 @@
 package: Control-Core
 version: "%(tag_basename)s"
-tag: "v1.19.1"
+tag: "v1.20.0"
 build_requires:
   - "GCC-Toolchain:(?!osx)"
   - golang

diff --git a/control-occplugin.sh b/control-occplugin.sh
@@ -1,6 +1,6 @@
 package: Control-OCCPlugin
 version: "%(tag_basename)s"
-tag: "v1.19.1"
+tag: "v1.20.0"
 requires:
   - FairMQ
   - FairLogger

diff --git a/control.sh b/control.sh
@@ -1,5 +1,5 @@
 package: Control
-version: "v1.19.1"
+version: "v1.20.0"
 requires:
   - Control-Core
   - Control-OCCPlugin

diff --git a/defaults-o2-epn.sh b/defaults-o2-epn.sh
@@ -10,6 +10,7 @@ env:
   GEANT4_BUILD_MULTITHREADED: 'OFF'
 disable:
   - AliGenerators
+  - AliGenO2
   - O2Physics
   - KFParticle
   - OpenSSL

diff --git a/dimrpcparallel.sh b/dimrpcparallel.sh
@@ -1,6 +1,6 @@
 package: DimRpcParallel
 version: "%(tag_basename)s"
-tag: v0.1.2
+tag: v0.1.3
 requires:
   - "dim:(?!osx)"
   - "GCC-Toolchain:(?!osx)"

diff --git a/infologger.sh b/infologger.sh
@@ -1,6 +1,6 @@
 package: InfoLogger
 version: "%(tag_basename)s"
-tag: v2.7.1
+tag: v2.7.2
 requires:
   - boost
   - "GCC-Toolchain:(?!osx)"

diff --git a/libinfologger.sh b/libinfologger.sh
@@ -1,6 +1,6 @@
 package: libInfoLogger
 version: "%(tag_basename)s"
-tag: v2.7.1
+tag: v2.7.2
 requires:
   - boost
   - "GCC-Toolchain:(?!osx)"

diff --git a/mesos.sh b/mesos.sh
@@ -42,7 +42,7 @@ cd build
     --with-rapidjson=${RAPIDJSON_ROOT}
 
 # We build with fewer jobs to avoid OOM errors in GCC
-make -j 6
+make -j $((JOBS / 2))
 make install
 
 

diff --git a/o2.sh b/o2.sh
@@ -1,6 +1,6 @@
 package: O2
 version: "%(tag_basename)s"
-tag: "daily-20240924-0200"
+tag: "daily-20240927-0200"
 requires:
   - abseil
   - arrow
@@ -23,7 +23,7 @@ requires:
   - libuv
   - libjalienO2
   - cgal
-  - VecGeom
+  - "VecGeom:(?!osx.*)"
   - FFTW3
   - ONNXRuntime
   - MLModels

diff --git a/o2dpg.sh b/o2dpg.sh
@@ -1,6 +1,6 @@
 package: O2DPG
 version: "%(tag_basename)s"
-tag: "daily-20240924-0200"
+tag: "daily-20240927-0200"
 source: https://github.com/AliceO2Group/O2DPG.git
 build_requires:
   - alibuild-recipe-tools

diff --git a/o2pdpsuite.sh b/o2pdpsuite.sh
@@ -1,6 +1,6 @@
 package: O2PDPSuite
 version: "%(tag_basename)s"
-tag: "daily-20240924-0200"
+tag: "daily-20240927-0200"
 requires:
   # List important packages separately, even though they're also
   # pulled in by O2sim, so they show up in the dependency list on Monalisa.

diff --git a/o2physics.sh b/o2physics.sh
@@ -1,6 +1,6 @@
 package: O2Physics
 version: "%(tag_basename)s"
-tag: "daily-20240924-0200"
+tag: "daily-20240927-0200"
 requires:
   - O2
   - ONNXRuntime

diff --git a/qualitycontrol.sh b/qualitycontrol.sh
@@ -1,6 +1,6 @@
 package: QualityControl
 version: "%(tag_basename)s"
-tag: v1.159.1
+tag: v1.160.0
 requires:
   - boost
   - "GCC-Toolchain:(?!osx)"

diff --git a/readoutcard.sh b/readoutcard.sh
@@ -1,6 +1,6 @@
 package: ReadoutCard
 version: "%(tag_basename)s"
-tag: v0.45.3
+tag: v0.45.4
 requires:
   - boost
   - "GCC-Toolchain:(?!osx)"

diff --git a/root.sh b/root.sh
@@ -1,6 +1,6 @@
 package: ROOT
 version: "%(tag_basename)s"
-tag: "v6-32-02-alice1"
+tag: "v6-32-06-alice1"
 source: https://github.com/alisw/root.git
 requires:
   - arrow
@@ -125,6 +125,7 @@ fi
 
 case $PKG_VERSION in
   v6[-.]30*) EXTRA_CMAKE_OPTIONS="-Dminuit2=ON -Dpythia6=ON -Dpythia6_nolink=ON" ;;
+  v6[-.]32[-.]0[6789]*) EXTRA_CMAKE_OPTIONS="-Dminuit=ON -Dpythia6=ON -Dpythia6_nolink=ON -Dproof=ON" ;;
   *) EXTRA_CMAKE_OPTIONS="-Dminuit=ON" ;;
 esac
 
@@ -169,7 +170,7 @@ cmake $SOURCEDIR
       -Dmathmore=ON                                                                    \
       -Droofit=ON                                                                      \
       -Dhttp=ON                                                                        \
-      -Droot7=OFF                                                                      \
+      -Droot7=ON                                                                       \
       -Dsoversion=ON                                                                   \
       -Dshadowpw=OFF                                                                   \
       -Dvdt=OFF                                                                        \

diff --git a/tpcfecutils.sh b/tpcfecutils.sh
@@ -10,7 +10,7 @@ requires:
   - LLA
 build_requires:
   - CMake
-source: https://gitlab.cern.ch/ALICEPrivateExternals/alice-tpc-fec-utils.git
+source: https://gitlab.cern.ch/alice-tpc-upgrade/alice-tpc-fec-utils
 incremental_recipe: |
   make ${JOBS:+-j$JOBS} install
   mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles