From 5510cbd3c3e31147c5d9111daa61e411937066ed Mon Sep 17 00:00:00 2001
From: sebas_correa <sebastian.correa@nullplatform.io>
Date: Wed, 29 Jul 2026 18:05:19 -0300
Subject: [PATCH] fix: use pull_request trigger with per-PR concurrency instead
 of workflow_run
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The workflow_run-triggered version merged in #454 fails immediately
with startup_failure (0 jobs ever scheduled) for reasons that aren't
visible via the API — likely an org-level Actions policy restricting
workflow_run, but that needs admin access to confirm.

Switch back to the pull_request trigger proven to work in the other
services-* repos, and instead solve the generate-readmes race with
concurrency: cancel-in-progress keyed on the PR number. When the
README-regeneration commit lands (observed ~38s after the release PR
is opened, on a real release), it fires a new 'synchronize' event;
GitHub cancels whatever older run for the same PR is still waiting on
checks, so only the run for the final commit can ever reach the merge
step.
---
 .github/workflows/auto-merge-release.yml | 45 ++++++------------------
 1 file changed, 11 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/auto-merge-release.yml b/.github/workflows/auto-merge-release.yml
index e20e9bea0..e4149fdae 100644
--- a/.github/workflows/auto-merge-release.yml
+++ b/.github/workflows/auto-merge-release.yml
@@ -1,45 +1,22 @@
 name: auto-merge-release-pr
 
 on:
-  workflow_run:
-    workflows: ["Release Please"]
-    types: [completed]
+  pull_request:
+    types: [opened, synchronize, labeled]
 
-permissions:
-  pull-requests: read
+# The release workflow's generate-readmes job pushes an extra commit
+# (regenerated READMEs) to the release PR branch shortly after it's opened
+# (observed gap: ~38s on a real release). That push fires a new
+# 'synchronize' event, starting a fresh run for this PR. Cancelling any
+# still-running older run for the same PR ensures we never merge a stale
+# commit that's missing the README update — the newest run always wins.
+concurrency:
+  group: auto-merge-release-pr-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
 
 jobs:
-  find-release-pr:
-    name: Find release PR
-    if: github.event.workflow_run.conclusion == 'success'
-    runs-on: ubuntu-24.04
-    outputs:
-      pr_number: ${{ steps.find.outputs.pr_number }}
-    steps:
-      # The "Release Please" workflow's generate-readmes job pushes an extra
-      # commit (regenerated READMEs) to the release PR branch after the PR is
-      # opened. Waiting for the whole workflow run to finish (workflow_run)
-      # instead of reacting directly to pull_request events avoids merging
-      # before that commit lands.
-      - name: Find open release-please PR
-        id: find
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          pr_number="$(gh pr list --repo "$GITHUB_REPOSITORY" \
-            --head release-please--branches--main \
-            --state open \
-            --json number,author,labels \
-            --jq '[.[] | select(.author.login == "github-actions[bot]" and ([.labels[].name] | contains(["autorelease: pending"])))][0].number // 0')"
-          echo "pr_number=$pr_number" >> "$GITHUB_OUTPUT"
-
   automerge:
-    name: Auto-merge release PR
-    needs: find-release-pr
-    if: needs.find-release-pr.outputs.pr_number != '0'
     uses: nullplatform/actions-nullplatform/.github/workflows/auto-merge-release.yml@main
-    with:
-      pr_number: ${{ fromJson(needs.find-release-pr.outputs.pr_number) }}
     secrets:
       app-id: ${{ secrets.APP_RELEASE_ID }}
       app-private-key: ${{ secrets.APP_RELEASE_PRIVATE_KEY }}