From af4ef868e23bc44da41e3cf66512af170ae95a28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20=C5=9Aliwi=C5=84ski?= Date: Sun, 19 Jul 2026 21:37:40 +0200 Subject: [PATCH] Update automerge to 5.2.6 version --- .github/workflows/automerge.yml | 8 +++++--- newsfragments/+6bd45c53.misc.rst | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 newsfragments/+6bd45c53.misc.rst diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 901e454e..17ec80a0 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -7,13 +7,15 @@ on: workflows: # List all required workflow names here. - 'Run tests' - - 'Run tests on macos' - 'Run linters' - 'Test build package' + check_suite: + types: + - completed jobs: automerge: - uses: fizyk/actions-reuse/.github/workflows/shared-automerge.yml@v4.4.7 + uses: fizyk/actions-reuse/.github/workflows/shared-automerge.yml@e434952f57d1da48b52d0fe5454b365b2f297d2d # v5.2.6 secrets: - app_id: ${{ secrets.MERGE_APP_ID }} + client_id: ${{ secrets.MERGE_APP_CLIENT_ID }} private_key: ${{ secrets.MERGE_APP_PRIVATE_KEY }} diff --git a/newsfragments/+6bd45c53.misc.rst b/newsfragments/+6bd45c53.misc.rst new file mode 100644 index 00000000..8ae5ca96 --- /dev/null +++ b/newsfragments/+6bd45c53.misc.rst @@ -0,0 +1 @@ +Update automerge to new 5.x version and change app id to client id