Merge branch 'master' into gcc-13-support

.github/workflows/clean-pr-checks-macos.yml

@@ -0,0 +1,39 @@
+---
+name: Clean macOS PR checks
+
+'on':
+  workflow_dispatch:
+    inputs:
+      pr:
+        description: PR number in this repo to be cleaned
+        type: string   # can't use number here
+        required: true
+
+      # Warning: GitHub limits the total number of inputs to 10, so a maximum of
+      # 9 checks is allowed here!
+      # Warning: the check_* keys are magic and must consist of the string
+      # "check_" followed by the applicable check name exactly. The
+      # "description" field is only the human-readable label for the input.
+      'check_build/alidist/O2Suite/o2/macOS':
+        description: build/alidist/O2Suite/o2/macOS
+        type: boolean
+        default: true
+      'check_build/alidist/O2Suite/o2/macOS-arm':
+        description: build/alidist/O2Suite/o2/macOS-arm
+        type: boolean
+        default: true
+
+permissions: {}
+
+jobs:
+  clean:
+    name: Clean macOS PR checks
+    uses: alisw/ali-bot/.github/workflows/clean-pr-checks.yml@master
+    with:
+      owner: ${{ github.event.repository.owner.login }}
+      repo: ${{ github.event.repository.name }}
+      pr: ${{ github.event.inputs.pr }}
+      checks: ${{ toJSON(github.event.inputs) }}
+    permissions:
+      pull-requests: read  # to get last commit for pr (octokit/graphql-action)
+      statuses: write      # for set-github-status

.github/workflows/clean-pr-checks.yml

@@ -26,6 +26,10 @@ name: Clean PR checks
         description: build/O2/alidist-dataflow-cs8
         type: boolean
         default: true
+      'check_build/O2/alidist-slc9-x86':
+        description: build/O2/alidist-slc9-x86
+        type: boolean
+        default: true
       'check_build/O2/alidist-ubuntu2204':
         description: build/O2/alidist-ubuntu2204
         type: boolean
@@ -34,14 +38,6 @@ name: Clean PR checks
         description: build/O2/fullCI/alidist
         type: boolean
         default: true
-      'check_build/alidist/O2Suite/o2/macOS':
-        description: build/alidist/O2Suite/o2/macOS
-        type: boolean
-        default: true
-      'check_build/alidist/O2Suite/o2/macOS-arm':
-        description: build/alidist/O2Suite/o2/macOS-arm
-        type: boolean
-        default: true
       'check_build/AliGenerators/generators':
         description: build/AliGenerators/generators
         type: boolean

abseil.sh

@@ -26,12 +26,7 @@ make ${JOBS:+-j$JOBS} install
 MODULEDIR="$INSTALLROOT/etc/modulefiles"
 MODULEFILE="$MODULEDIR/$PKGNAME"
 mkdir -p "$MODULEDIR"
-alibuild-generate-module > "$MODULEFILE"
+alibuild-generate-module --lib --bin --cmake > "$MODULEFILE"
 cat >> "$MODULEFILE" <<EoF
-
-# Our environment
-set ABSEIL_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PATH \$ABSEIL_ROOT/bin
-prepend-path LD_LIBRARY_PATH \$ABSEIL_ROOT/lib
-prepend-path LD_LIBRARY_PATH \$ABSEIL_ROOT/lib64
+prepend-path LD_LIBRARY_PATH \$PKG_ROOT/lib64
 EoF

alibuild-recipe-tools.sh

@@ -1,6 +1,6 @@
 package: alibuild-recipe-tools
-version: "0.2.3"
-tag: "v0.2.3"
+version: "0.2.5"
+tag: "v0.2.5"
 source: https://github.com/alisw/alibuild-recipe-tools
 ---
 mkdir -p $INSTALLROOT/bin

aligenerators.sh

@@ -23,6 +23,7 @@ requires:
   - lhapdf-pdfsets
   - JETSCAPE
   - EPOS4
+  - STARlight
 build_requires:
   - EPOS-test:(?!osx)
   - alibuild-recipe-tools

arrow.sh

@@ -119,4 +119,4 @@ find "$INSTALLROOT/share" -name '*-gdb.py' -exec mv {} "$INSTALLROOT/lib" \;
 
 # Modulefile
 mkdir -p "$INSTALLROOT/etc/modulefiles"
-alibuild-generate-module --lib > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
+alibuild-generate-module --lib --cmake > "$INSTALLROOT/etc/modulefiles/$PKGNAME"

bookkeeping-api.sh

@@ -1,6 +1,6 @@
 package: bookkeeping-api
-version: "v0.82.0"
-tag: "@aliceo2/bookkeeping@0.82.0"
+version: "v0.87.0"
+tag: "@aliceo2/bookkeeping@0.87.0"
 requires:
   - grpc
   - protobuf

boost.sh

@@ -119,7 +119,7 @@ MODULEDIR="$INSTALLROOT/etc/modulefiles"
 MODULEFILE="$MODULEDIR/$PKGNAME"
 
 mkdir -p etc/modulefiles
-alibuild-generate-module --lib > etc/modulefiles/$PKGNAME
+alibuild-generate-module --lib --cmake > etc/modulefiles/$PKGNAME
 cat << EOF >> etc/modulefiles/$PKGNAME
 prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
 EOF

coconut.sh

@@ -1,6 +1,6 @@
 package: coconut
 version: "%(tag_basename)s"
-tag: "v1.8.3"
+tag: "v1.11.0"
 build_requires:
   - golang
   - protobuf

common-o2.sh

@@ -30,7 +30,7 @@ make ${JOBS+-j $JOBS} install
 
 #ModuleFile
 mkdir -p etc/modulefiles
-alibuild-generate-module --lib > etc/modulefiles/$PKGNAME
+alibuild-generate-module --lib --cmake > etc/modulefiles/$PKGNAME
 cat << EOF >> etc/modulefiles/$PKGNAME
 prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
 EOF

control-core.sh

@@ -1,6 +1,6 @@
 package: Control-Core
 version: "%(tag_basename)s"
-tag: "v1.8.3"
+tag: "v1.11.0"
 build_requires:
   - "GCC-Toolchain:(?!osx)"
   - golang

control-occplugin.sh

@@ -1,6 +1,6 @@
 package: Control-OCCPlugin
 version: "%(tag_basename)s"
-tag: "v1.8.3"
+tag: "v1.11.0"
 requires:
   - FairMQ
   - FairLogger

control.sh

@@ -1,5 +1,5 @@
 package: Control
-version: "v1.8.3"
+version: "v1.11.0"
 requires:
   - Control-Core
   - Control-OCCPlugin

dds.sh

@@ -1,6 +1,6 @@
 package: DDS
 version: "%(tag_basename)s"
-tag: "3.8"
+tag: "3.10"
 source: https://github.com/FairRootGroup/DDS
 requires:
   - boost

debuggui.sh

@@ -7,7 +7,6 @@ requires:
   - FreeType
   - libuv
 build_requires:
-  - capstone
   - CMake
   - alibuild-recipe-tools
   - ninja
@@ -42,21 +41,6 @@ case $ARCHITECTURE in
     ;;
 esac
 
-# build the tracy profiler
-rsync -av $SOURCEDIR/tracy/ tracy/
-pushd tracy/profiler/build/unix
-  make ${JOBS+-j $JOBS}                                                                                                         \
-      LIBS="-L$CAPSTONE_ROOT/lib -L$GLFW_ROOT/lib -L$FREETYPE_ROOT/lib -lglfw -lfreetype -lcapstone -lpthread -ldl $EXTRA_LIBS" \
-      DEFINES="$DEFINES"                                                                                                        \
-      TBB=off                                                                                                                   \
-      TRACY_NO_FILESELECTOR=1                                                                                                   \
-      INCLUDES="-I$CAPSTONE_ROOT/include/capstone -I$SOURCEDIR/tracy/imgui -I$SOURCEDIR/tracy -I$SOURCEDIR/tracy/profiler/libs/gl3w ${FREETYPE_ROOT:+-I$FREETYPE_ROOT/include/freetype2} -I${GLFW_ROOT:+$GLFW_ROOT/include}"
-popd
-mkdir -p $INSTALLROOT/{include/tracy,bin}
-cp tracy/profiler/build/unix/Tracy-* $INSTALLROOT/bin/tracy-profiler
-cp tracy/*.{h,hpp,cpp} $INSTALLROOT/include/tracy
-cp -r tracy/{common,client,libbacktrace} $INSTALLROOT/include/tracy/
-
 cmake $SOURCEDIR                          \
       -DCMAKE_GENERATOR=Ninja             \
       -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \

defaults-ali.sh

@@ -7,7 +7,6 @@ env:
   CXXSTD: '20'
   ENABLE_VMC: 'ON'
   GEANT4_BUILD_MULTITHREADED: 'OFF'
-  MACOSX_DEPLOYMENT_TARGET: '10.15'
 disable:
   - mesos
   - MySQL

defaults-o2-dataflow.sh

@@ -35,19 +35,22 @@ disable:
   - OpenSSL
   - curl:(?!osx.*)
 overrides:
+  GCC-Toolchain:
+    version: "v12.2.0-alice1"
+    tag: "v12.2.0-alice1"
+  O2-customization:
+    env:
+      ENABLE_UPGRADES: "OFF"  # Disable detector upgrades in O2
+      BUILD_ANALYSIS: "OFF"   # Disable analysis in O2
+      BUILD_EXAMPLES: "OFF"   # Disable examples in O2
+      O2_BUILD_FOR_FLP: "ON"
   Python-modules-list:
     env:
       PIP_BASE_REQUIREMENTS: |
         pip==21.3.1
         setuptools==65.5.1
         wheel==0.37.1
       PIP_REQUIREMENTS: ""
-  O2-customization:
-    env:
-      ENABLE_UPGRADES: "OFF"  # Disable detector upgrades in O2
-      BUILD_ANALYSIS: "OFF"   # Disable analysis in O2
-      BUILD_EXAMPLES: "OFF"   # Disable examples in O2
-      O2_BUILD_FOR_FLP: "ON"
   DataDistribution:
     requires:
       - "GCC-Toolchain:(?!osx)"

fairlogger.sh

@@ -7,6 +7,8 @@ requires:
 build_requires:
   - CMake
   - "GCC-Toolchain:(?!osx)"
+  - ninja
+  - alibuild-recipe-tools
 incremental_recipe: |
   cmake --build . --target install ${JOBS:+-- -j$JOBS}
   mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
@@ -24,7 +26,6 @@ case $ARCHITECTURE in
 esac
 mkdir -p $INSTALLROOT
 
-
 cmake $SOURCEDIR                                                 \
       ${CXX_COMPILER:+-DCMAKE_CXX_COMPILER=$CXX_COMPILER}        \
       ${CMAKE_BUILD_TYPE:+-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE}  \
@@ -42,21 +43,9 @@ cmake --build . --target install ${JOBS:+-- -j$JOBS}
 
 # ModuleFile
 mkdir -p etc/modulefiles
-cat > etc/modulefiles/$PKGNAME <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0                                        \
-       ${FMT_REVISION:+fmt/${FMT_VERSION}-${FMT_REVISION}}
-# Our environment
-set FAIRLOGGER_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path LD_LIBRARY_PATH \$FAIRLOGGER_ROOT/lib
-prepend-path ROOT_INCLUDE_PATH \$FAIRLOGGER_ROOT/include
+alibuild-generate-module --lib --cmake > etc/modulefiles/$PKGNAME
+cat >> etc/modulefiles/$PKGNAME <<EoF
+prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
 EoF
 MODULEDIR="$INSTALLROOT/etc/modulefiles"
 mkdir -p $MODULEDIR && rsync -a --delete etc/modulefiles/ $MODULEDIR

fairroot.sh

@@ -90,7 +90,7 @@ MODULEDIR="$INSTALLROOT/etc/modulefiles"
 MODULEFILE="$MODULEDIR/$PKGNAME"
 mkdir -p "$MODULEDIR"
 
-alibuild-generate-module --bin --lib > $MODULEFILE
+alibuild-generate-module --bin --lib --cmake > $MODULEFILE
 
 cat >> "$MODULEFILE" <<EoF
 prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include

flatbuffers.sh

@@ -16,12 +16,6 @@ cmake "$SOURCEDIR"
 
 cmake --build . -- ${JOBS:+-j$JOBS} install
 
-# Work around potentially faulty CMake (missing `install` for binaries)
-#mkdir -p "$INSTALLROOT/bin"
-#for bin in flathash flatc; do
-#  [ -e "$INSTALLROOT/bin/$bin" ] || cp -p "$bin" "$INSTALLROOT/bin/"
-#done
-
 # Modulefile
 mkdir -p "$INSTALLROOT/etc/modulefiles"
-alibuild-generate-module --bin --lib > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
+alibuild-generate-module --bin --lib --cmake > "$INSTALLROOT/etc/modulefiles/$PKGNAME"

fmt.sh

@@ -21,7 +21,7 @@ MODULEDIR="$INSTALLROOT/etc/modulefiles"
 MODULEFILE="$MODULEDIR/$PKGNAME"
 mkdir -p "$MODULEDIR"
 
-alibuild-generate-module --lib > $MODULEFILE
+alibuild-generate-module --lib --cmake > $MODULEFILE
 cat << EOF >> $MODULEFILE
 prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
 EOF

golang.sh

@@ -2,8 +2,9 @@ package: golang
 version: "1.22.2"
 build_requires:
   - curl
+prefer_system: ".*"
 prefer_system_check: |
-  type go && case `go version | sed -e 's/go version go//' | sed -e 's/ .*//'` in 0*|1.[0-9].*) exit 1 ;; esac
+  type go && case `go version | sed -e 's/go version go//' | sed -e 's/ .*//'` in 1.2[2-9].*) exit 0 ;; *) exit 1 ;; esac
 ---
 case $ARCHITECTURE in
   osx_arm64)

jalien-root.sh

@@ -56,7 +56,7 @@ cmake --build . -- ${JOBS:+-j $JOBS} install
 
 # Modulefile
 mkdir -p etc/modulefiles
-alibuild-generate-module --lib > "etc/modulefiles/$PKGNAME"
+alibuild-generate-module --lib --cmake > "etc/modulefiles/$PKGNAME"
 cat >> "etc/modulefiles/$PKGNAME" <<EoF
 # Our environment
 append-path ROOT_PLUGIN_PATH \$PKG_ROOT/etc/plugins

jalien.sh

@@ -1,11 +1,10 @@
 package: JAliEn
 version: "%(tag_basename)s"
-tag: "1.8.6"
+tag: "1.8.8"
 source: https://gitlab.cern.ch/jalien/jalien.git
 requires:
   - JDK
   - XRootD
-  - xjalienfs
   - curl
 valid_defaults:
   - jalien

libinfologger.sh

@@ -31,7 +31,7 @@ ninja ${JOBS+-j $JOBS} install
 
 #ModuleFile
 mkdir -p etc/modulefiles
-alibuild-generate-module --bin --lib > etc/modulefiles/$PKGNAME
+alibuild-generate-module --bin --lib --cmake > etc/modulefiles/$PKGNAME
 cat >> etc/modulefiles/$PKGNAME <<EoF
 # Our environment
 set INFOLOGGER_ROOT \$::env(BASEDIR)/$PKGNAME/\$version

libjalieno2.sh

@@ -41,6 +41,7 @@ module load BASE/1.0 ${GCC_TOOLCHAIN_REVISION:+GCC-Toolchain/$GCC_TOOLCHAIN_VERS
 # Our environment
 set LIBJALIENO2_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
 prepend-path LD_LIBRARY_PATH \$LIBJALIENO2_ROOT/lib
+prepend-path CMAKE_PREFIX_PATH \$LIBJALIENO2_ROOT
 EoF
 
 mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles

libuv.sh

@@ -21,5 +21,5 @@ make ${JOBS+-j $JOBS}
 make install
 
 mkdir -p etc/modulefiles
-alibuild-generate-module --lib > etc/modulefiles/$PKGNAME
+alibuild-generate-module --lib --cmake > etc/modulefiles/$PKGNAME
 mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles

ms_gsl.sh

@@ -6,6 +6,7 @@ prepend_path:
   ROOT_INCLUDE_PATH: "$MS_GSL_ROOT/include"
 build_requires:
   - CMake
+  - alibuild-recipe-tools
   - "GCC-Toolchain:(?!osx)"
 ---
 #!/bin/bash -e
@@ -23,19 +24,7 @@ cmake --build . -- ${JOBS:+-j$JOBS} install
 MODULEDIR="$INSTALLROOT/etc/modulefiles"
 MODULEFILE="$MODULEDIR/$PKGNAME"
 mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 ${GCC_TOOLCHAIN_REVISION:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION}
-# Our environment
-set osname [uname sysname]
-set MS_GSL_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-setenv MS_GSL_ROOT \$MS_GSL_ROOT
-prepend-path ROOT_INCLUDE_PATH \$MS_GSL_ROOT/include
+alibuild-generate-module --cmake > $MODULEFILE
+cat >> "$MODULEFILE" <<EoF
+prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
 EoF