Merge branch 'feature/root_fix' into release/v09_83_00

LArSoft · Jan 10, 2024 · a662bdd · a662bdd
2 parents 1e3024f + 28958f0
commit a662bdd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
@@ -83,10 +83,10 @@ jobs:
       # TODO: Does the version need to change with compiler?
       - name: Pull ROOT
         if: matrix.monitoring == 'ON'
-        run: wget https://root.cern/download/root_v6.26.10.Linux-ubuntu22-x86_64-gcc11.3.tar.gz
+        run: wget https://root.cern/download/root_v6.26.14.Linux-ubuntu22-x86_64-gcc11.4.tar.gz
       - name: Unpack ROOT
         if: matrix.monitoring == 'ON'
-        run: tar -xzvf root_v6.26.10.Linux-ubuntu22-x86_64-gcc11.3.tar.gz && mv root/ /pandora/root
+        run: tar -xzvf root_v6.26.14.Linux-ubuntu22-x86_64-gcc11.4.tar.gz && mv root/ /pandora/root
 
       # Sort LibTorch install out.
       - name: Pull Torch

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -60,8 +60,8 @@ jobs:
       - name: Install ROOT
         if: matrix.monitoring == 'ON'
         run: |
-          wget https://root.cern/download/root_v6.26.10.Linux-ubuntu18-x86_64-gcc7.5.tar.gz
-          tar -xzvf root_v6.26.10.Linux-ubuntu18-x86_64-gcc7.5.tar.gz && mv root/ /pandora/root
+          wget https://root.cern/download/root_v6.26.14.Linux-ubuntu20-x86_64-gcc9.4.tar.gz
+          tar -xzvf root_v6.26.14.Linux-ubuntu20-x86_64-gcc9.4.tar.gz && mv root/ /pandora/root
 
       # Sort LibTorch install out...
       - name: Install Torch

diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------------------------------------------------------------------
+TAG v04_06_01
+--------------------------------------------------------------------------------------------------------------------------------------------
+Git actions workflow updates to reflect upstream changes in ROOT
+
 --------------------------------------------------------------------------------------------------------------------------------------------
 TAG v04_06_00
 --------------------------------------------------------------------------------------------------------------------------------------------