From 2879460fb9bd56526d1ddab81c1593ed31d2d47c Mon Sep 17 00:00:00 2001
From: Thomas Madlener <thomas.madlener@desy.de>
Date: Mon, 13 Apr 2026 17:08:39 +0200
Subject: [PATCH 1/2] Update the Key4hep based CI workflow

Use available releases and nightlies
---
 .github/workflows/key4hep.yml | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/key4hep.yml b/.github/workflows/key4hep.yml
index 46e7265..94fe320 100644
--- a/.github/workflows/key4hep.yml
+++ b/.github/workflows/key4hep.yml
@@ -1,18 +1,31 @@
-name: keyh4ep
-on: [push, pull_request]
+name: Key4hep build
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  build-and-test:
-    runs-on: ubuntu-latest
+  build:
     strategy:
       matrix:
         build_type: ["release", "nightly"]
-        image: ["alma9", "ubuntu22"]
+        image: ["alma9"]
+        include:
+          - build_type: nightly
+            image: ubuntu24
       fail-fast: false
-
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+    - uses: key4hep/key4hep-actions/cache-external-data@main
     - uses: key4hep/key4hep-actions/key4hep-build@main
       with:
         build_type: ${{ matrix.build_type }}
         image: ${{ matrix.image }}
+        stack: ${{ matrix.stack }}

From 79e3a3e8f6a1e3727e79a01ac8cb3db6f37d9a16 Mon Sep 17 00:00:00 2001
From: Thomas Madlener <thomas.madlener@desy.de>
Date: Mon, 13 Apr 2026 17:09:10 +0200
Subject: [PATCH 2/2] Remove clicdp based CI workflows

Builds are no longer maintained
---
 .github/workflows/coverity.yml | 21 ---------------------
 .github/workflows/linux.yml    | 26 --------------------------
 2 files changed, 47 deletions(-)
 delete mode 100644 .github/workflows/coverity.yml
 delete mode 100644 .github/workflows/linux.yml

diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
deleted file mode 100644
index ab50693..0000000
--- a/.github/workflows/coverity.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: coverity
-
-on:
-  schedule:
-    - cron:  '0 0 * * *'
-
-jobs:
-  run-coverity:
-    runs-on: ubuntu-latest
-    if: github.repository == 'iLCSoft/MarlinUtil'
-    steps:
-    - uses: actions/checkout@v2
-    - uses: cvmfs-contrib/github-action-cvmfs@v2
-    - uses: aidasoft/run-lcg-view@v3
-      with:
-        coverity-cmake-command: 'cmake -C $ILCSOFT/ILCSoft.cmake -DBUILD_TESTING=OFF ..'
-        coverity-project: 'iLCSoft%2FMarlinUtil'
-        coverity-project-token: ${{ secrets.MARLINUTIL_COVERITY_TOKEN }}
-        github-pat: ${{ secrets.READ_COVERITY_IMAGE }}
-        view-path: "/cvmfs/clicdp.cern.ch/iLCSoft/lcg/100/nightly/x86_64-centos7-gcc10-opt"
-        setup-script: "init_ilcsoft.sh"
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
deleted file mode 100644
index 9f5e16b..0000000
--- a/.github/workflows/linux.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: linux
-on: [push, pull_request]
-
-jobs:
-  centos7:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        COMPILER: [gcc11]
-        LCG: [104]
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: cvmfs-contrib/github-action-cvmfs@v4
-    - uses: aidasoft/run-lcg-view@v4
-      with:
-        view-path: "/cvmfs/clicdp.cern.ch/iLCSoft/lcg/${{ matrix.LCG }}/nightly/x86_64-centos7-${{ matrix.COMPILER }}-opt"
-        setup-script: "init_ilcsoft.sh"
-        run: |
-          mkdir build
-          cd build
-          cmake -GNinja -C ${ILCSOFT}/ILCSoft.cmake -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always " ..
-          ninja -k0
-          ctest --output-on-failure
-          ninja install