From 6eaa674a7f7dd744c1a738a4e2b4efc5344c2423 Mon Sep 17 00:00:00 2001 From: Arseny Kapoulkine Date: Fri, 22 Nov 2024 08:15:40 +0900 Subject: [PATCH] Wait before enabling auto-merge during update flow There seems to be a race condition, where creating a PR creates it in a mergeable state as actions haven't started yet, so auto-merge may just merge the PR immediately without waiting for them to succeed or fail. For now attempt to resolve this by waiting for a minute before enabling auto-merge. --- .github/workflows/update.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 1db7d45..6fae307 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -27,7 +27,9 @@ jobs: title: Update to 1.3.${{env.VOLK_VERSION}} author: GitHub - name: enable pr automerge - run: gh pr merge --merge --auto ${{env.PULL_REQUEST_NUMBER}} + run: | + sleep 60 + gh pr merge --merge --auto ${{env.PULL_REQUEST_NUMBER}} env: GH_TOKEN: ${{ github.token }} continue-on-error: true