Merge pull request #31856 from hashicorp/m-correct-reusable-labeler-w…

…orkflow Ensure `issue_comment` triggers are correctly evaluated
hashicorp · Jun 8, 2023 · f3ba90c · f3ba90c
2 parents 360f9ca + a404c1f
commit f3ba90c
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/.github/workflows/reusable-add-or-remove-labels.yml b/.github/workflows/reusable-add-or-remove-labels.yml
@@ -21,12 +21,15 @@ jobs:
     name: 'Modify Label(s)'
     runs-on: ubuntu-latest
     env:
-      ITEM_TYPE: 'pr'
+      ITEM_TYPE: 'issue'
     steps:
       - name: 'Determine if the Item is an Issue or Pull Request'
-        if: github.event_name == 'issues'
+        # The issue_comment trigger happens for issues and pull requests.
+        # The best way to determine if an issue_comment trigger is related to an issue or pull request is to check
+        # whether or not github.event.issue.pull_request is empty.
+        if: github.event.pull_request || github.event.issue.pull_request
         run: |
-          echo 'ITEM_TYPE=issue' >> $GITHUB_ENV
+          echo 'ITEM_TYPE=pr' >> $GITHUB_ENV
 
       - name: 'Add Label(s) to Issue or Pull Request'
         if: inputs.add != ''