[ISSUE #545]🔧Update label-on-approval.yml

.github/workflows/label-on-approval.yml

@@ -1,39 +1,52 @@
-name: Label on Approval
+name: Add Label on Approval
 
 on:
   pull_request_review:
-    types: [ submitted ]
+    types: [ submitted,edited ]
 
 jobs:
-  add-label-on-approval:
+  add-label:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-      - name: Check for approval and add label
-        uses: actions/github-script@v6
-        env:
-          GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
+      - name: Check if approval is from Collaborators
+        if: github.event.review.state == 'APPROVED'
+        id: check_approval
+        uses: actions/github-script@v7
         with:
+          github-token: ${{ secrets.PAT_TOKEN }}
           script: |
-            const approved = context.payload.review.state === 'approved';
-            const owner = context.repo.owner;
-            const repo = context.repo.repo;
-            const pull_number = context.payload.pull_request.number;
-
-            if (approved) {
-              const { data: collaborators } = await github.repos.listCollaborators({ owner, repo });
-              const reviewer = context.payload.review.user.login;
-              const isOwner = collaborators.some(collab => collab.login === reviewer && collab.permissions.admin);
-
-              if (isOwner) {
-                await github.issues.addLabels({
-                  owner,
-                  repo,
-                  issue_number: pull_number,
-                  labels: ['approved','auto merge']
-                });
-              }
-            }
+            const { owner, repo } = context.repo;
+            const { pull_request, review } = context.payload;
+
+            // Define your list of collaborators
+            const collaborators = ['mxsm', 'TeslaRustor','SpaceXCN']; // Replace with actual GitHub usernames
+
+            // Check if the review is approved and from a collaborator
+            const isApprovedByCollaborator = review.state === 'approved' && collaborators.includes(review.user.login);
+
+            // Return the result to the workflow
+            return { approvedByCollaborator: isApprovedByCollaborator, pullRequestNumber: pull_request.number };
+
+      - name: Add label if approved by Collaborators
+        if: steps.check_approval.outputs.approvedByCollaborator == true
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.PAT_TOKEN }}
+          script: |
+            const { owner, repo } = context.repo;
+            const { pullRequestNumber } = steps.check_approval.outputs;
+
+            // Add your label here
+            const labelToAdd = 'approved-by-collaborator';
+
+            // Add the label to the pull request
+            await github.rest.issues.addLabels({
+              owner,
+              repo,
+              issue_number: pullRequestNumber,
+              labels: ['approved','auto merge']
+            });