From c7f41f985c411db52a26d0b47b5ed4358aedcde3 Mon Sep 17 00:00:00 2001 From: Carlos Polop Date: Fri, 5 Jun 2026 00:16:31 +0200 Subject: [PATCH] ci: trigger release workflow after windows definitions auto-merge --- .github/workflows/chack-agent-pr-triage.yml | 2 +- .github/workflows/update_windows_version_definitions.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/chack-agent-pr-triage.yml b/.github/workflows/chack-agent-pr-triage.yml index 7e27c31..ac356e1 100644 --- a/.github/workflows/chack-agent-pr-triage.yml +++ b/.github/workflows/chack-agent-pr-triage.yml @@ -88,7 +88,7 @@ jobs: - name: Merge trusted bot PR if: ${{ steps.bot_pr.outputs.should_merge == 'true' }} env: - GH_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ secrets.CHACK_AGENT_FIXER_TOKEN || github.token }} PR_NUMBER: ${{ steps.bot_pr.outputs.pr_number }} COMMIT_TITLE: ${{ steps.bot_pr.outputs.title }} run: | diff --git a/.github/workflows/update_windows_version_definitions.yml b/.github/workflows/update_windows_version_definitions.yml index d174838..a67e282 100644 --- a/.github/workflows/update_windows_version_definitions.yml +++ b/.github/workflows/update_windows_version_definitions.yml @@ -39,6 +39,7 @@ jobs: - name: Create validated update pull request env: GH_TOKEN: ${{ github.token }} + MERGE_TOKEN: ${{ secrets.CHACK_AGENT_FIXER_TOKEN || github.token }} run: | title="chore(winpeas): update windows version vulnerability definitions" branch="bot/update-windows-version-definitions" @@ -76,7 +77,7 @@ jobs: gh workflow run PR-tests.yml --ref "$branch" - if gh pr merge "$pr_number" --squash --auto --subject "$title"; then + if GH_TOKEN="$MERGE_TOKEN" gh pr merge "$pr_number" --squash --auto --subject "$title"; then echo "Auto-merge enabled for PR #$pr_number." else echo "Could not enable GitHub auto-merge for PR #$pr_number; the PR-tests workflow_run merge job will still merge it after tests pass."