Update CI to ROOT 6.34.00

guitargeek · Dec 9, 2024 · 0ff79b6 · 0ff79b6
1 parent 54197a8
commit 0ff79b6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.github/documentation.md b/.github/documentation.md
@@ -14,12 +14,14 @@ docker run --security-opt label=disable -it registry.cern.ch/root-ci/ubuntu2404:
 
 In the container
 ```bash
+ROOT_VERSION=6.34.00
+
 mkdir workspace
 cd workspace
 
-wget "https://root.cern/download/root_v6.32.06.source.tar.gz"
-tar -xf root_v6.32.06.source.tar.gz
-mv root-6.32.06 root_src
+wget "https://root.cern/download/root_v$ROOT_VERSION.source.tar.gz"
+tar -xf root_v$ROOT_VERSION.source.tar.gz
+mv root-$ROOT_VERSION root_src
 mkdir root_build
 cd root_build
 
@@ -28,13 +30,13 @@ cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
       -Dfail-on-missing=ON -Dfitsio=OFF \
       -Dmysql=OFF -Dpgsql=OFF -Dsqlite=OFF \
       -Dtmva=OFF -Dtmva-pymva=OFF -Droofit=OFF \
-      -Dvdt=OFF \
+      -Dvdt=OFF -Dtestsupport=ON \
       -DCMAKE_INSTALL_PREFIX=../root_install ../root_src
 
 cmake --build . --target install -j24
 cd ..
 
-BINARY_NAME=root_v6.32.06.ubuntu24.04.no-roofit.RelWithDebInfo
+BINARY_NAME=root_v$ROOT_VERSION.ubuntu24.04.no-roofit.RelWithDebInfo
 
 mv root_install root
 
@@ -43,6 +45,7 @@ tar -czvf $BINARY_NAME.tar.gz root
 
 On the host (figure out container name with `docker ps`):
 ```bash
-BINARY_NAME=root_v6.32.06.ubuntu24.04.no-roofit.RelWithDebInfo
+ROOT_VERSION=6.34.00
+BINARY_NAME=root_v$ROOT_VERSION.ubuntu24.04.no-roofit.RelWithDebInfo
 docker cp <NAME>:workspace/$BINARY_NAME.tar.gz .
 ```
diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml
@@ -39,7 +39,7 @@ jobs:
       # Runs a set of commands using the runners shell
       - name: Download ROOT
         run: |
-          BINARY_NAME=root_v6.32.06.ubuntu24.04.no-roofit.RelWithDebInfo
+          BINARY_NAME=root_v6.34.00.ubuntu24.04.no-roofit.RelWithDebInfo
           wget -q https://rembserj.web.cern.ch/rembserj/data/binaries/$BINARY_NAME.tar.gz
           tar -xf $BINARY_NAME.tar.gz
       - name: Compile RooFit

diff --git a/default.nix b/default.nix
@@ -5,7 +5,7 @@ clangStdenv.mkDerivation {
   src = ./.;
 
   buildInputs = [
-    (root.overrideAttrs (old: { cmakeFlags = old.cmakeFlags ++ [ "-Droofit=OFF -Dtmva=OFF" ]; }))
+    (root.overrideAttrs (old: { cmakeFlags = old.cmakeFlags ++ [ "-Droofit=OFF -Dtmva=OFF -Dtestsupport=ON" ]; }))
     cmake
     gtest
     gsl