From 199f76559d6ed9b1660e801ad394377e7e8eb957 Mon Sep 17 00:00:00 2001
From: Gerwin Klein <gerwin.klein@proofcraft.systems>
Date: Wed, 22 Jul 2026 18:17:56 +1000
Subject: [PATCH] github: let deploy jobs finish on push

Don't cancel deployment jobs that have started when a new commit is
pushed. Instead let it finish so that the job in the new commit can
benefit from the images built in the first one.

Make the concurrency group ID that controls this more robust. The
previous strategy.job-index was dependent on the order GitHub expanded
the matrix in.

Signed-off-by: Gerwin Klein <gerwin.klein@proofcraft.systems>
---
 .github/workflows/proof-deploy.yml | 12 ++++++------
 .github/workflows/proof.yml        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/proof-deploy.yml b/.github/workflows/proof-deploy.yml
index 07dea00749..590749eafc 100644
--- a/.github/workflows/proof-deploy.yml
+++ b/.github/workflows/proof-deploy.yml
@@ -69,10 +69,10 @@ jobs:
             plat: bcm2711
           - arch: AARCH64
             plat: imx8mm
-    # test only most recent push:
+    # test only most recent push, but let started jobs finish:
     concurrency:
-      group: l4v-regression-${{ github.ref }}-${{ strategy.job-index }}
-      cancel-in-progress: true
+      group: l4v-deploy-${{ github.ref }}-${{ matrix.arch }}-${{ matrix.num_domains }}-${{ matrix.plat }}
+      cancel-in-progress: false
     steps:
     - name: Proofs
       uses: seL4/ci-actions/aws-proofs@master
@@ -107,10 +107,10 @@ jobs:
         arch: [ARM, RISCV64]
         num_domains: ['1', '']
         plat: [""]
-    # test only most recent push:
+    # test only most recent push, but let started jobs finish
     concurrency:
-      group: l4v-mcs-regression-${{ github.ref }}-${{ strategy.job-index }}
-      cancel-in-progress: true
+      group: l4v-mcs-deploy-${{ github.ref }}-${{ matrix.arch }}-${{ matrix.num_domains }}-${{ matrix.plat }}
+      cancel-in-progress: false
     steps:
     - name: Proofs
       uses: seL4/ci-actions/aws-proofs@master
diff --git a/.github/workflows/proof.yml b/.github/workflows/proof.yml
index 5b1064665f..4a16f24669 100644
--- a/.github/workflows/proof.yml
+++ b/.github/workflows/proof.yml
@@ -30,7 +30,7 @@ jobs:
         arch: [ARM, ARM_HYP, AARCH64, RISCV64, X64]
     # test only most recent push to PR:
     concurrency:
-      group: l4v-${{ github.workflow }}-${{ github.event.number }}-idx-${{ strategy.job-index }}
+      group: l4v-${{ github.workflow }}-${{ github.event.number }}-idx-${{ matrix.arch }}
       cancel-in-progress: true
     steps:
     - name: Proofs