Use run-lcg-view action and more recent LCG releases

AIDASoft · Feb 25, 2021 · 6e5658c · 6e5658c
1 parent cdef37e
commit 6e5658c
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 58 deletions.
diff --git a/.github/scripts/compile_and_test.sh b/.github/scripts/compile_and_test.sh
@@ -2,14 +2,6 @@
 
 ENABLE_SIO=${USE_SIO:-OFF}
 
-# Depending on whether we need SIO or not setup the environment accordingly
-if [ ${ENABLE_SIO} = "OFF" ]; then
-    source /cvmfs/sft.cern.ch/lcg/views/${VIEW}/setup.sh
-else
-    source /cvmfs/clicdp.cern.ch/iLCSoft/${VIEW}/init_ilcsoft.sh
-fi
-
-cd /Package
 source init.sh
 mkdir build install
 cd build

diff --git a/.github/scripts/runPythonChecks.sh b/.github/scripts/runPythonChecks.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-source /cvmfs/sft.cern.ch/lcg/views/${VIEW}/setup.sh
-cd /Package
-
 echo "RUNNING PYLINT PY3K CHECK" && \
 find . -name "*.py" -exec pylint --rcfile=.github/scripts/podio.pylint.py3k.rc --py3k --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" {} + && \
 echo "" && \

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -8,23 +8,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        LCG: ["LCG_98python3/x86_64-mac1015-clang110-opt","LCG_97apython3/x86_64-mac1015-clang110-opt"]
+        LCG: ["LCG_98python3/x86_64-mac1015-clang110-opt",
+              "LCG_97apython3/x86_64-mac1015-clang110-opt"]
     steps:
     - uses: actions/checkout@v2
     - uses: cvmfs-contrib/github-action-cvmfs@v2
       with:
         cvmfs_repositories: 'sft.cern.ch,geant4.cern.ch'
-    - name: Install LCG dependencies
-      run: |
-        brew install ninja
-        brew install gfortran
-        brew install --cask xquartz
-    - name: Compile and test
-      run: |
-        source /Users/Shared/cvmfs/sft.cern.ch/lcg/views/${{ matrix.LCG }}/setup.sh
-        mkdir build install
-        cd build
-        cmake  -GNinja -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_CXX_STANDARD=17  -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror" ..
-        ninja -k 0
-        ninja install
-        ctest --output-on-failure
+    - uses: aidasoft/run-lcg-view@v2
+      with:
+        release-platform: ${{ matrix.LCG }}
+        run: |
+          /bin/bash .github/scripts/compile_and_test.sh
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -7,14 +7,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix:
-        LCG: ["LCG_96b/x86_64-centos7-gcc9-opt"]
     steps:
     - uses: actions/checkout@v2
     - uses: cvmfs-contrib/github-action-cvmfs@v2
-    - name: Start container
-      run: |
-        docker run -it --privileged --name CI_container -v /home/runner/work/podio/podio:/Package -e VIEW=${{ matrix.LCG }} -v /cvmfs:/cvmfs:shared -d ghcr.io/aidasoft/centos7:latest /bin/bash
-    - name: Run Python Checks
-      run: |
-        docker exec CI_container /bin/bash -c "./Package/.github/scripts/runPythonChecks.sh"
+    - uses: aidasoft/run-lcg-view@v2
+      with:
+        release-platform: LCG_99/x86_64-centos7-gcc10-opt
+        run: |
+          /bin/bash .github/scripts/runPythonChecks.sh
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,17 +8,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        LCG: ["LCG_96b/x86_64-centos7-gcc8-opt",
-              "LCG_97a/x86_64-centos7-gcc9-opt",
-              "LCG_98/x86_64-centos7-clang10-opt",
+        LCG: ["LCG_99/x86_64-centos7-gcc8-opt",
+              "LCG_99/x86_64-centos7-clang10-opt",
+              "LCG_99/x86_64-centos8-gcc10-opt",
               "LCG_98python3/x86_64-centos7-gcc9-opt",
               "LCG_98python3/x86_64-centos7-gcc10-opt"]
     steps:
     - uses: actions/checkout@v2
     - uses: cvmfs-contrib/github-action-cvmfs@v2
-    - name: Start container
-      run: |
-        docker run -it --privileged --name CI_container -v /home/runner/work/podio/podio:/Package -e VIEW=${{ matrix.LCG }} -v /cvmfs:/cvmfs:shared -d ghcr.io/aidasoft/centos7:latest /bin/bash
-    - name: Compile and test
-      run: |
-        docker exec CI_container /bin/bash -c "./Package/.github/scripts/compile_and_test.sh"
+    - uses: aidasoft/run-lcg-view@v2
+      with:
+        release-platform: ${{ matrix.LCG }}
+        run: |
+          /bin/bash .github/scripts/compile_and_test.sh
diff --git a/.github/workflows/test_with_sio.yml b/.github/workflows/test_with_sio.yml
@@ -3,17 +3,30 @@ name: sio_io
 on: [push, pull_request]
 
 jobs:
-  build_and_test:
+  ilcsoft_nightlies:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ILCSoft: ["lcg/97/nightly/x86_64-centos7-gcc9-opt"]
+        LCG: ["LCG_99/x86_64-centos7-gcc10-opt",
+              "LCG_99/x86_64-ubuntu2004-gcc9-opt"]
     steps:
     - uses: actions/checkout@v2
     - uses: cvmfs-contrib/github-action-cvmfs@v2
-    - name: Start container
-      run: |
-        docker run -it --privileged --name CI_container -v /home/runner/work/podio/podio:/Package -e VIEW=${{ matrix.ILCSoft }} -e USE_SIO=ON -v /cvmfs:/cvmfs:shared -d ghcr.io/aidasoft/centos7:latest /bin/bash
-    - name: Compile and test
-      run: |
-        docker exec CI_container /bin/bash -c "./Package/.github/scripts/compile_and_test.sh"
+    - uses: aidasoft/run-lcg-view@v2
+      with:
+        release-platform: ${{ matrix.LCG }}
+        run: |
+          USE_SIO=ON /bin/bash .github/scripts/compile_and_test.sh
+
+  mac-os:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: cvmfs-contrib/github-action-cvmfs@v2
+      with:
+        cvmfs_repositories: 'sft.cern.ch,geant4.cern.ch'
+    - uses: aidasoft/run-lcg-view@v2
+      with:
+       release-platform: LCG_99/x86_64-mac1015-clang120-opt
+       run: |
+         USE_SIO=ON /bin/bash .github/scripts/compile_and_test.sh
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -8,13 +8,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        LCG: ["LCG_98/x86_64-ubuntu1804-gcc7-opt", "LCG_98/x86_64-ubuntu1804-gcc8-opt"]
+        LCG: ["LCG_98python3/x86_64-ubuntu1804-gcc7-opt"]
     steps:
     - uses: actions/checkout@v2
     - uses: cvmfs-contrib/github-action-cvmfs@v2
-    - name: Start container
-      run: |
-        docker run -it --privileged --name CI_container -v /home/runner/work/podio/podio:/Package -e VIEW=${{ matrix.LCG }} -v /cvmfs:/cvmfs:shared -d ghcr.io/aidasoft/ubuntu18:latest /bin/bash
-    - name: Compile and test
-      run: |
-        docker exec CI_container /bin/bash -c "./Package/.github/scripts/compile_and_test.sh"
+    - uses: aidasoft/run-lcg-view@v2
+      with:
+        release-platform: ${{ matrix.LCG }}
+        run: |
+          /bin/bash .github/scripts/compile_and_test.sh