merge

Author: Isengo1989

.github/workflows/base_schema.yml

@@ -66,13 +66,17 @@ jobs:
         done
 
         for k in $(yq '. | keys | .[]' enhance.yml); do
-          newData=$(yq ".\"${k}\"" enhance.yml);
+          newData=$(yq -r ".\"${k}\"" enhance.yml);
           # escape all keys by default
           j=$(echo "$k" | sed -r 's/[.]+/"."/g')
           # remove first extra quote
           j=${j#*\"}
-          # add one extra quote at the end
-          yq -I 4 -o json -i "${j}\" = \"${newData}\"" adminapi.json
+          # only apply enhancement if the target field exists in adminapi.json
+          if yq -e "${j}\"" adminapi.json >/dev/null 2>&1; then
+            yq -I 4 -o json -i "${j}\" = \"${newData}\"" adminapi.json
+          else
+            echo "Skip: ${k} (path: ${j}\") not found in adminapi.json"
+          fi
         done
                   
     - name: Download original file

.github/workflows/manual_versioning.yml

@@ -34,31 +34,63 @@ on:
         default: true
 
 jobs:
+  guard:
+    name: "Check version matches branch"
+    runs-on: ubuntu-22.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 }}