From 394996ae9b31cf2cbd9d7e2e673d68efa26d934a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 16 Nov 2025 11:42:37 +0100 Subject: [PATCH 1/2] gha: test against docker v29, v28 Signed-off-by: Sebastiaan van Stijn --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bc4bd18a54..d50a1f73212 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -156,8 +156,8 @@ jobs: - plugin - standalone engine: - - 27 # old stable (latest major - 1) - - 28 # current stable + - 28 # old stable (latest major - 1) + - 29 # current stable steps: - name: Prepare run: | From 623416a377b1b271057dabfae846869f09bb202f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 16 Nov 2025 12:04:01 +0100 Subject: [PATCH 2/2] gha: use custom names for matrix Manually enumerate the combinations ((plugin|standalone), (version)) so that we can assign a predictable name ("stable", "oldstable") and prevent having to update the branch-protection rules for each update to mark the tests as required. Signed-off-by: Sebastiaan van Stijn --- .github/workflows/ci.yml | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d50a1f73212..85ccf8cc6f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -149,15 +149,26 @@ jobs: if: always() e2e: runs-on: ubuntu-latest + name: e2e (${{ matrix.mode }}, ${{ matrix.channel }}) strategy: fail-fast: false matrix: - mode: - - plugin - - standalone - engine: - - 28 # old stable (latest major - 1) - - 29 # current stable + include: + # current stable + - mode: plugin + engine: 29 + channel: stable + - mode: standalone + engine: 29 + channel: stable + + # old stable (latest major - 1) + - mode: plugin + engine: 28 + channel: oldstable + - mode: standalone + engine: 28 + channel: oldstable steps: - name: Prepare run: |