Skip to content

Commit

Permalink
Sort out all the remaining GitHub Actions config.
Browse files Browse the repository at this point in the history
  • Loading branch information
CrossR authored and AndyChappell committed Nov 5, 2024
1 parent 1c47e72 commit f6c118d
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 23 deletions.
29 changes: 14 additions & 15 deletions .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
build:

# Use the latest ubuntu image: https://github.com/actions/runner-images
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
name: LArContent - Coverity

# Only run in the PandoraPFA repos.
Expand All @@ -23,7 +23,7 @@ jobs:
strategy:
fail-fast: false # Don't quit other jobs if one job fails.
matrix:
compiler: [ {cpp: g++-9, c: gcc-9} ]
compiler: [ {cpp: g++-12, c: gcc-12} ]
monitoring: [ "ON" ]
torch: [ "ON" ]

Expand All @@ -36,7 +36,7 @@ jobs:

# Install ROOT dependencies to start with
- name: apt Install Dependencies
run: sudo apt install -y xlibmesa-glu-dev
run: sudo apt install -y xlibmesa-glu-dev libvdt-dev

# Make a central location to build from.
- name: Create build folder
Expand All @@ -45,10 +45,10 @@ jobs:
# Cache the build tool, to speed up subsequent runs.
- name: Cache Coverity Build Tool
id: cov-build-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /pandora/coverity/
key: cov-build-2022.6
key: cov-build-2023.12

# Get Coverity build tool
- name: Get Coverity Build Tool
Expand Down Expand Up @@ -80,50 +80,49 @@ jobs:
make -j$(nproc) install
# Sort ROOT install out.
# 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.14.Linux-ubuntu22-x86_64-gcc11.4.tar.gz
run: wget https://root.cern/download/root_v6.28.12.Linux-ubuntu22-x86_64-gcc11.4.tar.gz
- name: Unpack ROOT
if: matrix.monitoring == 'ON'
run: tar -xzvf root_v6.26.14.Linux-ubuntu22-x86_64-gcc11.4.tar.gz && mv root/ /pandora/root
run: tar -xzvf root_v6.28.12.Linux-ubuntu22-x86_64-gcc11.4.tar.gz && mv root/ /pandora/root

# Sort LibTorch install out.
- name: Pull Torch
if: matrix.torch == 'ON'
run: wget https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.13.0%2Bcpu.zip
run: wget https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.1.1%2Bcpu.zip
- name: Unpack Torch
if: matrix.torch == 'ON'
run: unzip libtorch-cxx11-abi-shared-with-deps-1.13.0+cpu.zip && mv libtorch/ /pandora/libtorch
run: unzip libtorch-cxx11-abi-shared-with-deps-2.1.1+cpu.zip && mv libtorch/ /pandora/libtorch

# Pull the various dependencies and LArContent.
- name: Pull PandoraPFA
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: 'PandoraPFA/PandoraPFA'
path: PandoraPFA

- name: Pull PandoraSDK
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: 'PandoraPFA/PandoraSDK'
path: PandoraSDK

- name: Pull PandoraMonitoring
if: matrix.monitoring == 'ON'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: 'PandoraPFA/PandoraMonitoring'
path: PandoraMonitoring

- name: Pull LArContent
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: 'PandoraPFA/LArContent'
path: LArContent

- name: Pull LArReco
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: 'PandoraPFA/LArReco'
path: LArReco
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
- 'larpandoradlcontent'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Check clang-format
uses: jidicula/clang-format-action@v4.10.2
uses: jidicula/clang-format-action@v4.13.0
with:
clang-format-version: '13'
clang-format-version: '18'
check-path: ${{ matrix.path }}

10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,31 +72,31 @@ jobs:
# Pull the various Pandora repos...
- name: Pull PandoraPFA
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: 'PandoraPFA/PandoraPFA'
path: PandoraPFA

- name: Pull PandoraSDK
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: 'PandoraPFA/PandoraSDK'
path: PandoraSDK

- name: Pull PandoraMonitoring
if: matrix.monitoring == 'ON'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: 'PandoraPFA/PandoraMonitoring'
path: PandoraMonitoring

- name: Pull LArContent
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: LArContent

- name: Pull LArReco
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: 'PandoraPFA/LArReco'
path: LArReco
Expand Down

0 comments on commit f6c118d

Please sign in to comment.