From 58cd79e7091d10b0784db75d6a66dc57be41e143 Mon Sep 17 00:00:00 2001
From: Krzysztof Kacprzak <k.kacprzak@yahoo.com>
Date: Fri, 12 Jan 2024 16:54:21 -0300
Subject: [PATCH 1/3] update root files urls for github workflows
---
.github/workflows/ci-workflow.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index 969158a1..ae14a4da 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -18,18 +18,18 @@ jobs:
- name: download ROOT (for ubuntu 22.04)
run: |
- wget https://root.cern/download/root_v6.26.02.Linux-ubuntu22-x86_64-gcc11.2.tar.gz
- tar xzf root_v6.26.02.Linux-ubuntu22-x86_64-gcc11.2.tar.gz
+ wget https://root.cern/download/root_v6.30.02.Linux-ubuntu22.04-x86_64-gcc11.4.tar.gz
+ tar xzf root_v6.30.02.Linux-ubuntu22.04-x86_64-gcc11.4.tar.gz
if: matrix.os == 'ubuntu-22.04'
- name: download ROOT (for ubuntu 20.04)
run: |
- wget https://root.cern/download/root_v6.24.02.Linux-ubuntu20-x86_64-gcc9.3.tar.gz
- tar xzf root_v6.24.02.Linux-ubuntu20-x86_64-gcc9.3.tar.gz
+ wget https://root.cern/download/root_v6.30.02.Linux-ubuntu20.04-x86_64-gcc9.4.tar.gz
+ tar xzf root_v6.30.02.Linux-ubuntu20.04-x86_64-gcc9.4.tar.gz
if: matrix.os == 'ubuntu-20.04'
- name: download ROOT (for ubuntu-18.04)
run: |
- wget http://sphinx.if.uj.edu.pl/framework/root-6-20-06-ubuntu18-jpet.tar.gz
- tar xzf root-6-20-06-ubuntu18-jpet.tar.gz
+ wget http://sphinx.if.uj.edu.pl/framework/root_v6.25.01.Linux-ubuntu18-x86_64-gcc7.5.tar.gz
+ tar xzf root_v6.25.01.Linux-ubuntu18-x86_64-gcc7.5.tar.gz
if: matrix.os == 'ubuntu-18.04'
- name: cmake
run: |
From d876d59f479b4f196b1be5bb622504160fb88baa Mon Sep 17 00:00:00 2001
From: Krzysztof Kacprzak <k.kacprzak@yahoo.com>
Date: Fri, 12 Jan 2024 17:11:24 -0300
Subject: [PATCH 2/3] add required package for root 30
---
.github/workflows/ci-workflow.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index ae14a4da..a7bcac46 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -14,7 +14,7 @@ jobs:
- name: system update
run: |
sudo apt-get -qq update
- sudo apt-get install -y git libboost-all-dev libtbb-dev cmake
+ sudo apt-get install -y git libboost-all-dev libtbb-dev cmake nlohmann-json3-dev
- name: download ROOT (for ubuntu 22.04)
run: |
From 52ef28e8d84af402d542422c26b6cb7d8e414f80 Mon Sep 17 00:00:00 2001
From: Krzysztof Kacprzak <k.kacprzak@yahoo.com>
Date: Sun, 14 Jan 2024 13:01:11 -0300
Subject: [PATCH 3/3] revert root verstion for automated test with ubuntu 20
---
.github/workflows/ci-workflow.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index a7bcac46..e3b17815 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -23,8 +23,8 @@ jobs:
if: matrix.os == 'ubuntu-22.04'
- name: download ROOT (for ubuntu 20.04)
run: |
- wget https://root.cern/download/root_v6.30.02.Linux-ubuntu20.04-x86_64-gcc9.4.tar.gz
- tar xzf root_v6.30.02.Linux-ubuntu20.04-x86_64-gcc9.4.tar.gz
+ wget https://root.cern/download/root_v6.24.02.Linux-ubuntu20-x86_64-gcc9.3.tar.gz
+ tar xzf root_v6.24.02.Linux-ubuntu20-x86_64-gcc9.3.tar.gz
if: matrix.os == 'ubuntu-20.04'
- name: download ROOT (for ubuntu-18.04)
run: |