fix: single vendor with no grant in a push will zero out the entire vendor batch

.github/workflows/ofl-ota-cronjob.yml

@@ -56,7 +56,15 @@ jobs:
           for branch in "${branches[@]}"; do
             echo "::group::$branch"
 
-            since="$(gh api "repos/${{ github.repository }}/actions/workflows/ofl-ota-cronjob.yml/runs" \
+            # post_merge_profiles.yml's own run history, not this workflow's: this
+            # workflow only ever runs against main (schedule, or workflow_dispatch
+            # --ref main), so its head branch never varies - filtering ITS history
+            # by $branch would never match anything except main. post_merge_profiles.yml
+            # genuinely runs per-branch (this dispatch below sets --ref "$branch"),
+            # so its history is the real per-branch checkpoint. It also means a
+            # failed publish naturally gets retried tomorrow: the checkpoint only
+            # advances on a run that actually succeeded.
+            since="$(gh api "repos/${{ github.repository }}/actions/workflows/post_merge_profiles.yml/runs" \
               -f status=success -f branch="$branch" -f per_page=1 \
               --jq '.workflow_runs[0].run_started_at // empty')"
 
@@ -78,10 +86,15 @@ jobs:
             fi
 
             if [ "$changed" = true ]; then
-              gh workflow run post_merge_profiles.yml \
+              # Tolerate a per-branch failure (e.g. a pre-existing release branch
+              # whose post_merge_profiles.yml predates the vendor/auto_publish
+              # inputs) rather than aborting the whole scan under set -e.
+              if ! gh workflow run post_merge_profiles.yml \
                 --repo "${{ github.repository }}" \
                 --ref "$branch" \
-                -f vendor="$VENDOR"
+                -f vendor="$VENDOR" -f auto_publish=true; then
+                echo "::warning::failed to dispatch post_merge_profiles.yml for $branch - its post_merge_profiles.yml at this ref may predate the vendor/auto_publish inputs"
+              fi
             fi
 
             echo "::endgroup::"

.github/workflows/post_merge_profiles.yml

@@ -42,6 +42,16 @@ on:
           Leave empty to fall back to diffing the triggering commit.
         required: false
         type: string
+      auto_publish:
+        description: >-
+          After publishing, also call the OTA auto-publish API to go live
+          immediately, skipping the human changelog/Publish step. Separate
+          from `vendor` on purpose: a maintainer can dispatch with just
+          `vendor` set to rebuild/republish an asset without it going live.
+          Only the OFL nightly cron should set this to true.
+        required: false
+        type: boolean
+        default: false
 
 permissions:
   contents: read
@@ -88,12 +98,27 @@ jobs:
         run: |
           set -euo pipefail
 
+          # A vendor has a manifest plus either a preset directory or a version
+          # field; this drops non-vendor files such as blacklist.json. Shared by
+          # both the explicit-dispatch path below and the push-diff path further
+          # down, so the definition of "valid vendor" can't drift between them.
+          is_valid_vendor() {
+            local v="$1"
+            local json="resources/profiles/$v.json"
+            [ -f "$json" ] && { [ -d "resources/profiles/$v" ] || jq -e '.version' "$json" >/dev/null 2>&1; }
+          }
+
           # Explicit vendor dispatch (e.g. the OFL cron): trust the caller and
           # skip both the git-diff detection and the FOLDER_MERGERS check below.
           if [ -n "$DISPATCH_VENDOR" ]; then
             v="$DISPATCH_VENDOR"
-            json="resources/profiles/$v.json"
+            # Becomes part of the release asset filename and the OTA API's
-            if [ ! -f "$json" ] || { [ ! -d "resources/profiles/$v" ] && ! jq -e '.version' "$json" >/dev/null 2>&1; }; then
+            # payload; keep it to the same charset every real vendor name uses.
+            if ! [[ "$v" =~ ^[A-Za-z0-9]+$ ]]; then
+              echo "::error::vendor '$v' must be alphanumeric"
+              exit 1
+            fi
+            if ! is_valid_vendor "$v"; then
               echo "::error::vendor '$v' has no resources/profiles/$v.json with a profile directory or version field"
               exit 1
             fi
@@ -117,10 +142,7 @@ jobs:
           vendors=()
           for v in "${candidates[@]:-}"; do
             [ -n "$v" ] || continue
-            json="resources/profiles/$v.json"
+            if is_valid_vendor "$v"; then
-            # A vendor has a manifest plus either a preset directory or a version
-            # field; this drops non-vendor files such as blacklist.json.
-            if [ -f "$json" ] && { [ -d "resources/profiles/$v" ] || jq -e '.version' "$json" >/dev/null 2>&1; }; then
               vendors+=("$v")
             fi
           done
@@ -282,11 +304,14 @@ jobs:
           } >> "$GITHUB_STEP_SUMMARY"
 
       - name: Notify OTA auto-publish
-        # Only the explicit-vendor-dispatch path (e.g. the OFL cron) goes live
+        # Gated on auto_publish specifically, not just "vendor was dispatched":
-        # automatically. The ordinary push path stays human-gated: assets land on
+        # a maintainer manually dispatching with vendor=OrcaFilamentLibrary (e.g.
-        # the profiles release above, and a maintainer still has to attach a
+        # to rebuild/republish an asset while debugging) must not silently go
-        # changelog and hit Publish in OrcaCloud's OTA Manager for those.
+        # live. Only a caller that explicitly opts in with auto_publish=true
-        if: steps.vendors.outputs.vendors != '' && github.event_name == 'workflow_dispatch' && inputs.vendor != ''
+        # (the OFL nightly cron) skips the human changelog/Publish step.
+        if: >-
+          steps.vendors.outputs.vendors != '' && github.event_name == 'workflow_dispatch'
+          && (inputs.auto_publish == true || inputs.auto_publish == 'true')
         shell: bash
         env:
           OTA_API_BASE_URL: ${{ vars.OTA_API_BASE_URL }}