From 4b2bd01b1a5e9029b6ba571886f33ba017c8c562 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Tue, 21 Oct 2025 15:15:31 +0200 Subject: [PATCH 1/2] ROX-31317: disable mintmaker auto-approvals for release branches --- .github/renovate.json5 | 1 + .github/workflows/auto-approve.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 6786ac2df..887479e6a 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -88,6 +88,7 @@ } ], "labels": [ + // Add auto-approve label, which will approve the changes with rhacs-bot if they go to the default branch of the repository. "auto-approve", ], } diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index fbf3e2332..4d1e202c7 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -9,7 +9,7 @@ jobs: auto-approve: name: Auto-approve Konflux updates runs-on: ubuntu-latest - if: github.actor == 'red-hat-konflux[bot]' && github.event.label.name == 'auto-approve' + if: github.actor == 'red-hat-konflux[bot]' && github.event.label.name == 'auto-approve' && github.event.pull_request.base.ref == github.event.pull_request.base.repo.default_branch steps: - env: GH_TOKEN: ${{ secrets.RHACS_BOT_GITHUB_TOKEN }} From 5d4783db04085d9ad239997c8c695ef19a9d9da5 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Wed, 22 Oct 2025 09:41:22 +0200 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Misha Sugakov <537715+msugakov@users.noreply.github.com> --- .github/renovate.json5 | 2 +- .github/workflows/auto-approve.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 887479e6a..bd7b27cb2 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -88,7 +88,7 @@ } ], "labels": [ - // Add auto-approve label, which will approve the changes with rhacs-bot if they go to the default branch of the repository. + // Add auto-approve label which triggers the corresponding workflow. "auto-approve", ], } diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index 4d1e202c7..5277bbace 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -7,7 +7,7 @@ on: jobs: auto-approve: - name: Auto-approve Konflux updates + name: Auto-approve Konflux updates for default branch runs-on: ubuntu-latest if: github.actor == 'red-hat-konflux[bot]' && github.event.label.name == 'auto-approve' && github.event.pull_request.base.ref == github.event.pull_request.base.repo.default_branch steps: