Merge branch 'main' of https://github.com/sfegan/calin

sfegan · Jul 2, 2024 · 35696e4 · 35696e4
2 parents 1930b4e + 5ceff7c
commit 35696e4
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/.github/workflows/native-build-and-test.yml b/.github/workflows/native-build-and-test.yml
@@ -42,14 +42,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04]
-        compiler: [ [gcc-10, g++-10, 'gcc-10 g++-10', broadwell ],
+        os: [ubuntu-22.04]
+        geant: [11.2.2]
+        compiler: [ [gcc-12, g++-12, 'gcc-12 g++-12', broadwell ],
+                    [gcc-11, g++-11, 'gcc-11 g++-11', broadwell ],
+                    [gcc-10, g++-10, 'gcc-10 g++-10', broadwell ],
                     [gcc-9, g++-9, 'gcc-9 g++-9', broadwell ],
-                    [gcc-8, g++-8, 'gcc-8 g++-8', broadwell ],
-                    [gcc-7, g++-7, 'gcc-7 g++-7', broadwell ],
-                    [clang-12, clang++-12, 'clang-12', broadwell ],
-                    [clang-11, clang++-11, 'clang-11', broadwell ],
-                    [clang-10, clang++-10, 'clang-10', broadwell ] ]
+                    [clang-15, clang++-15, 'clang-15', broadwell ],
+                    [clang-14, clang++-14, 'clang-14', broadwell ],
+                    [clang-13, clang++-13, 'clang-13', broadwell ],
+                    [clang-12, clang++-12, 'clang-12', broadwell ] ]
 
     runs-on: ${{ matrix.os }}
 
@@ -63,13 +65,13 @@ jobs:
       shell: bash
       run: |
         sudo apt-get update -y
-        sudo apt-get install -y gsl-bin libgsl0-dev libfftw3-dev python-numpy  \
+        sudo apt-get install -y gsl-bin libgsl0-dev libfftw3-dev               \
           libzmq3-dev python3 python3-dev python3-numpy libxerces-c-dev        \
           libpcap-dev libz-dev libprotobuf-c-dev protobuf-c-compiler           \
           libprotobuf-dev protobuf-compiler libprotoc-dev libzstd-dev          \
           ${{ matrix.compiler[2] }}
-        curl -L https://github.com/llr-cta/CamerasToACTLRelease/releases/download/latest/CamerasToACTL.tgz | sudo tar -zxf - -C /
-        curl -L https://github.com/llr-cta/Geant4Build/releases/download/ubuntu-20.04-10.7.2/Geant4-ubuntu-20.04-10.7.2.tbz2 | sudo tar -jxf - -C /
+        curl -L https://github.com/llr-cta/CamerasToACTLRelease/releases/download/${{matrix.os}}/CamerasToACTL-${{matrix.os}}.tgz | sudo tar -zxf - -C /
+        curl -L https://github.com/llr-cta/Geant4Build/releases/download/${{matrix.os}}-${{matrix.geant}}/Geant4-${{matrix.os}}-${{matrix.geant}}.tbz2 | sudo tar -jxf - -C /
     - name: Print version information
       shell: bash
       run: |