Change BASE_REF to use github.ref instead of github.base_ref

downstream/action.yml

@@ -92,6 +92,7 @@ runs:
             "upstream": {
               "id": "${{ github.run_id }}",
               "ref": "${{ github.head_ref || github.ref }}",
+              "base_ref": "${{ github.base_ref }}",
               "repo": "${{ github.repository }}",
               "github-token": "${{ github.token }}",
               "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"

setup-extension/action.yml

@@ -204,7 +204,8 @@ runs:
         DEPS: ${{ inputs.dependencies }}
         REF: ${{ inputs.shopwareVersion }}
         HEAD_REF: ${{ github.head_ref }}
-        BASE_REF: ${{ github.base_ref }}
+        # if base ref is not set we run in downstream and use the current ref as fallback
+        BASE_REF: ${{ github.base_ref || github.ref }}
         FALLBACK: ${{ inputs.shopwareVersionFallback }}
       run: |
         for dep in $(echo "$DEPS" | envsubst | jq -c '.[]'); do

shopware-version/shopware-version.bash

@@ -105,17 +105,22 @@ else
                 version="${remote_ref#"refs/heads/"}"
                 echo "✓ Found matching next major: ${version}"
             else
-                echo "✗ No matching branch found, using fallback: ${FALLBACK}"
-                # Use fallback
-                version="${FALLBACK}"
+                echo "✗ No matching branch found, checking fallback: ${FALLBACK}"
+
+                fallback_ref=$(git ls-remote --heads "${REPO}" "${FALLBACK}" | cut -f 2)
+                if [[ -n "${fallback_ref}" ]]; then
+                    # Use fallback
+                    version="${FALLBACK}"
+                    echo "✓ Found matching fallback: ${FALLBACK}"
+                fi
             fi
         fi
     fi
 fi
 
 if [[ -z "$version" ]]; then
-    echo "$REF not found in ${REPO}, using fallback "
-    version="${FALLBACK}"
+    echo "$REF not found in ${REPO}, using hard-coded fallback = trunk"
+    version="trunk"
 fi
 
 echo "Matching shopware version: $version"