From 4af82c8631c6adb4e82fda545031c1f9b0ea8ede Mon Sep 17 00:00:00 2001
From: asyncapi-bot <61865014+asyncapi-bot@users.noreply.github.com>
Date: Tue, 23 Nov 2021 12:15:10 +0100
Subject: [PATCH] ci: update global workflows

---
 .github/workflows/automerge.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 6104f470..293acd7e 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -1,5 +1,5 @@
-#This action is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+ # This action is centrally managed in https://github.com/asyncapi/.github/
+ # Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo.
 
 name: Automerge release bump PR
 
@@ -21,15 +21,27 @@ on:
 jobs:
 
   autoapprove:
-    if: github.event.pull_request.draft == false
+    if: (github.event.pull_request.draft == false) && (github.actor == 'asyncapi-bot' || github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]') && !contains(github.event.pull_request.labels.*.name, 'released')
     runs-on: ubuntu-latest
     steps:
       - name: Autoapproving
         uses: hmarr/auto-approve-action@v2
-        if: github.actor == ('asyncapi-bot' || github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]') && !contains(github.event.pull_request.labels.*.name, 'released')
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
+      - name: Label autoapproved
+        uses: actions/github-script@v5
+        with:
+          github-token: ${{ secrets.GH_TOKEN }}
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['autoapproved']
+            }) 
+
+
   automerge:
     needs: [autoapprove]
     runs-on: ubuntu-latest
@@ -45,15 +57,3 @@ jobs:
           MERGE_COMMIT_MESSAGE: "pull-request-title"
           MERGE_RETRIES: "20"
           MERGE_RETRY_SLEEP: "30000"
-  
-  labelWhenApproved:
-    needs: [autoapprove]
-    name: Label when approved
-    runs-on: ubuntu-latest
-    steps:
-    - name: Label when approved
-      uses: pullreminders/label-when-approved-action@v1.0.7
-      env:
-        APPROVALS: "1"
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        ADD_LABEL: "autoapproved"
\ No newline at end of file