From bf0b833a943064240a06e6ed0a3902c9b49315c0 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Tue, 27 May 2025 15:08:16 +0200 Subject: [PATCH 1/2] Disable schedule for auto-merge-on-demand. Allow run it on comment '/auto-merge-on-demant' Signed-off-by: Petr "Stone" Hracek --- .github/workflows/auto-merge-on-demand.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/auto-merge-on-demand.yml b/.github/workflows/auto-merge-on-demand.yml index 47003fdd..9cd10d05 100644 --- a/.github/workflows/auto-merge-on-demand.yml +++ b/.github/workflows/auto-merge-on-demand.yml @@ -1,8 +1,8 @@ -name: Auto Merge Scheduled / On Demand +name: Auto Merge On Demand on: - schedule: - # Workflow runs every 45 minutes - - cron: '*/45 * * * *' + issue_comment: + types: + - created workflow_dispatch: inputs: pr-number: @@ -16,7 +16,10 @@ permissions: jobs: # Get all open PRs gather-pull-requests: - if: github.repository_owner == 'sclorg' + if: | + github.repository_owner == 'sclorg' + || (contains(github.event.comment.body, '/auto-merge-on-demand') + && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association) runs-on: ubuntu-latest outputs: @@ -44,7 +47,7 @@ jobs: name: Parse manual input run: | # shellcheck disable=SC2086 - echo "result="[ ${{ inputs.pr-number }} ]"" >> $GITHUB_OUTPUT + echo "result="[ ${{ github.event.issue.number }} ]"" >> $GITHUB_OUTPUT shell: bash validate-pr: From f1e6a0f581dbeb308caa8d026596dd768fd60a59 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Tue, 27 May 2025 15:30:18 +0200 Subject: [PATCH 2/2] Replace it to /auto-merge Signed-off-by: Petr "Stone" Hracek --- .github/workflows/auto-merge-on-demand.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-merge-on-demand.yml b/.github/workflows/auto-merge-on-demand.yml index 9cd10d05..9341a611 100644 --- a/.github/workflows/auto-merge-on-demand.yml +++ b/.github/workflows/auto-merge-on-demand.yml @@ -18,7 +18,7 @@ jobs: gather-pull-requests: if: | github.repository_owner == 'sclorg' - || (contains(github.event.comment.body, '/auto-merge-on-demand') + || (contains(github.event.comment.body, '/auto-merge') && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association) runs-on: ubuntu-latest