From 706a629b1bfb6cc1d0f0cc3f03d92545dbdec7d9 Mon Sep 17 00:00:00 2001
From: Micha <m.hobert@shopware.com>
Date: Wed, 22 Apr 2026 16:34:15 +0200
Subject: [PATCH 1/3] add/guardrail-for-octo-calls

---
 .github/workflows/manual_versioning.yml | 44 +++++++++++++++++++++----
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/manual_versioning.yml b/.github/workflows/manual_versioning.yml
index e27876f..af00ed1 100644
--- a/.github/workflows/manual_versioning.yml
+++ b/.github/workflows/manual_versioning.yml
@@ -34,31 +34,63 @@ on:
         default: true
 
 jobs:
+  guard:
+    name: "Check version matches branch"
+    runs-on: ubuntu-24.04
+    outputs:
+      proceed: ${{ steps.check.outputs.proceed }}
+    steps:
+      - id: check
+        env:
+          VERSION: ${{ inputs.shopware_version }}
+          BRANCH: ${{ github.ref_name }}
+        run: |
+          # Map branch -> expected version pattern. Bump `latest` when it moves.
+          case "$BRANCH" in
+            latest)     expected='^v?6\.7\.' ;;
+            v6.6)       expected='^v?6\.6\.' ;;        
+            main|trunk) expected='.*' ;;
+            *)          expected='.*' ;;
+          esac
+
+          if [[ "$VERSION" =~ $expected ]]; then
+            echo "proceed=true" >> "$GITHUB_OUTPUT"
+            echo "::notice::Accepting $VERSION on branch $BRANCH"
+          else
+            echo "proceed=false" >> "$GITHUB_OUTPUT"
+            echo "::notice::Skipping: $VERSION does not belong on branch $BRANCH"
+          fi
+
   generate-trunk:
-    if: ${{ inputs.trigger_default_schema }}
+    needs: guard
+    if: ${{ needs.guard.outputs.proceed == 'true' && inputs.trigger_default_schema }}
     uses: ./.github/workflows/base_schema.yml
     with:
       shopware_version: ${{ inputs.shopware_version }}
       php_version: ${{ inputs.php_version }}
     secrets: inherit
-    
+
   generate-commercial-trunk:
-    if: ${{ inputs.trigger_commercial_schema }}
+    needs: guard
+    if: ${{ needs.guard.outputs.proceed == 'true' && inputs.trigger_commercial_schema }}
     uses: ./.github/workflows/plugin_commercial_schema.yml
     with:
       shopware_version: ${{ inputs.shopware_version }}
       php_version: ${{ inputs.php_version }}
     secrets: inherit
-    
+
   generate-digitalsalesroom-trunk:
-    if: ${{ inputs.trigger_digitalsalesroom_schema }}
+    needs: guard
+    if: ${{ needs.guard.outputs.proceed == 'true' && inputs.trigger_digitalsalesroom_schema }}
     uses: ./.github/workflows/plugin_digitalsalesroom_schema.yml
     with:
       shopware_version: ${{ inputs.shopware_version }}
       php_version: ${{ inputs.php_version }}
     secrets: inherit
+
   generate-customproducts-trunk:
-    if: ${{ inputs.trigger_customproducts_schema }}
+    needs: guard
+    if: ${{ needs.guard.outputs.proceed == 'true' && inputs.trigger_customproducts_schema }}
     uses: ./.github/workflows/plugin_customproducts_schema.yml
     with:
       shopware_version: ${{ inputs.shopware_version }}

From effe7122617e5f53a9e01dda6c17894bf7a237ff Mon Sep 17 00:00:00 2001
From: Micha Hobert <m.hobert@shopware.com>
Date: Wed, 22 Apr 2026 16:55:06 +0200
Subject: [PATCH 2/3] Update .github/workflows/manual_versioning.yml

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .github/workflows/manual_versioning.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/manual_versioning.yml b/.github/workflows/manual_versioning.yml
index af00ed1..4719cca 100644
--- a/.github/workflows/manual_versioning.yml
+++ b/.github/workflows/manual_versioning.yml
@@ -48,7 +48,7 @@ jobs:
           # Map branch -> expected version pattern. Bump `latest` when it moves.
           case "$BRANCH" in
             latest)     expected='^v?6\.7\.' ;;
-            v6.6)       expected='^v?6\.6\.' ;;        
+            v6.6)       expected='^v?6\.6\.' ;;
             main|trunk) expected='.*' ;;
             *)          expected='.*' ;;
           esac

From 3a0c2eb9fa22a8915a78072dda2c6bbbdad44dc9 Mon Sep 17 00:00:00 2001
From: Micha Hobert <m.hobert@shopware.com>
Date: Wed, 22 Apr 2026 16:55:24 +0200
Subject: [PATCH 3/3] Update .github/workflows/manual_versioning.yml

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .github/workflows/manual_versioning.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/manual_versioning.yml b/.github/workflows/manual_versioning.yml
index 4719cca..90ae818 100644
--- a/.github/workflows/manual_versioning.yml
+++ b/.github/workflows/manual_versioning.yml
@@ -36,7 +36,7 @@ on:
 jobs:
   guard:
     name: "Check version matches branch"
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     outputs:
       proceed: ${{ steps.check.outputs.proceed }}
     steps: