From 17725d37dc7535422ed899d8bfdbea36ef9b07eb Mon Sep 17 00:00:00 2001
From: Guillaume Lours <705411+glours@users.noreply.github.com>
Date: Thu, 19 Dec 2024 12:03:57 +0100
Subject: [PATCH] replace tibdex/github-app-token by official GitHub
 create-github-app-token

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
---
 .github/workflows/merge.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 3b20a31bfb..f643ff068f 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -129,12 +129,13 @@ jobs:
       -
         name: Generate Token
         id: generate_token
-        uses: tibdex/github-app-token@3eb77c7243b85c65e84acfa93fdbac02fb6bd532 # v2.1.0
+        uses: actions/create-github-app-token@v1
         with:
-          app_id: ${{ vars.DOCKERDESKTOP_APP_ID }}
-          private_key: ${{ secrets.DOCKERDESKTOP_APP_PRIVATEKEY }}
-          repositories: >-
-            [docker/${{ secrets.DOCKERDESKTOP_REPO }}]
+          app-id: ${{ vars.DOCKERDESKTOP_APP_ID }}
+          private-key: ${{ secrets.DOCKERDESKTOP_APP_PRIVATEKEY }}
+          owner: docker
+          repositories: |
+            ${{ secrets.DOCKERDESKTOP_REPO }}
       -
         name: Trigger Docker Desktop e2e with edge version
         uses: actions/github-script@v7