Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use run-lcg-view github action and switch to more recent LCG releases in CI #182

Merged
merged 6 commits into from
Mar 30, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .github/scripts/compile_and_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions .github/scripts/runPythonChecks.sh
Original file line number Diff line number Diff line change
@@ -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 "" && \
Expand Down
22 changes: 7 additions & 15 deletions .github/workflows/mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
petricm marked this conversation as resolved.
Show resolved Hide resolved
13 changes: 5 additions & 8 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
17 changes: 8 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
29 changes: 21 additions & 8 deletions .github/workflows/test_with_sio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 6 additions & 7 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# podio

[![linux](https://github.com/AIDASoft/podio/actions/workflows/test.yml/badge.svg)](https://github.com/AIDASoft/podio/actions/workflows/test.yml)
[![mac](https://github.com/AIDASoft/podio/actions/workflows/mac.yml/badge.svg)](https://github.com/AIDASoft/podio/actions/workflows/mac.yml)
[![ubuntu](https://github.com/AIDASoft/podio/actions/workflows/ubuntu.yml/badge.svg)](https://github.com/AIDASoft/podio/actions/workflows/ubuntu.yml)
[![coverity](https://scan.coverity.com/projects/22634/badge.svg)](https://scan.coverity.com/projects/aidasoft-podio)

## Documentation

- [Introduction](./doc/doc.md)
Expand Down