From ecc1b44200233733f698da5c26ff1bfabc86a38f Mon Sep 17 00:00:00 2001 From: Juraj Smiesko <34742917+kjvbrt@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:50:49 +0100 Subject: [PATCH] Updating GH workflows (#75) --- .github/workflows/docs.yml | 23 +++++++++++------------ .github/workflows/key4hep-build.yaml | 8 +++++++- README.md | 13 +++++++++---- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 136dda9..14de7b1 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -4,7 +4,8 @@ name: Deploy reference documentation to GitHub Pages on: # Runs on pushes targeting the default branch push: - branches: ["main"] + branches: + - main # Allows to run this workflow manually from the Actions tab workflow_dispatch: @@ -27,24 +28,22 @@ jobs: url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest steps: - - uses: cvmfs-contrib/github-action-cvmfs@v2 + - uses: cvmfs-contrib/github-action-cvmfs@v4 - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Start container run: | docker run -it --name CI_container \ -v ${GITHUB_WORKSPACE}:/Package \ -v /cvmfs:/cvmfs:shared \ - -d ghcr.io/aidasoft/centos7:latest /bin/bash + -d ghcr.io/key4hep/key4hep-images/alma9:latest /bin/bash - name: Configure run: | - docker exec CI_container /bin/bash -c 'cd Package - mkdir -p build + docker exec CI_container /bin/bash -c 'cd ./Package source /cvmfs/sw.hsf.org/key4hep/setup.sh + mkdir -p build cd build - cmake -DCMAKE_CXX_STANDARD=17 \ - -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always " \ - -G Ninja ..' + cmake -G Ninja ..' - name: Build docs run: | docker exec CI_container /bin/bash -c 'cd ./Package @@ -52,11 +51,11 @@ jobs: cd build ninja -k0 doc' - name: Setup Pages - uses: actions/configure-pages@v3 + uses: actions/configure-pages@v5 - name: Upload artifact - uses: actions/upload-pages-artifact@v1 + uses: actions/upload-pages-artifact@v3 with: path: './build/doxygen/html' - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 + uses: actions/deploy-pages@v4 diff --git a/.github/workflows/key4hep-build.yaml b/.github/workflows/key4hep-build.yaml index 3f9007f..6023823 100644 --- a/.github/workflows/key4hep-build.yaml +++ b/.github/workflows/key4hep-build.yaml @@ -6,13 +6,19 @@ on: - main pull_request: workflow_dispatch: + schedule: + - cron: '52 4 * * *' + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true jobs: build: strategy: matrix: build_type: ["release", "nightly"] - image: ["alma9", "ubuntu22", "centos7"] + image: ["alma9", "ubuntu22"] fail-fast: false runs-on: ubuntu-latest steps: diff --git a/README.md b/README.md index 64b1d5e..fc009b0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # k4SimGeant4 -Gaudi Components for Geant4 Simulation in the Key4HEP software framework. +[![key4hep-build](https://github.com/HEP-FCC/k4SimGeant4/actions/workflows/key4hep-build.yaml/badge.svg)](https://github.com/HEP-FCC/k4SimGeant4/actions/workflows/key4hep-build.yaml) +[![docs](https://github.com/HEP-FCC/k4SimGeant4/actions/workflows/docs.yml/badge.svg)](https://github.com/HEP-FCC/k4SimGeant4/actions/workflows/docs.yml) + +Gaudi Components for Geant4 Simulation in the Key4hep software framework. See the [FCC Tutorials](https://hep-fcc.github.io/fcc-tutorials/) for documentation on the usage in FCC. @@ -24,8 +27,10 @@ xdg-open doxygen/html/index.html ## Dependencies -* Gaudi (=>v35r0) -* k4FWCore (=>1.0) +* Gaudi +* k4FWCore * Geant4 * DD4hep -* EDM4HEP +* EDM4hep +* ROOT +* CLHEP