Added rebase needed.

apache · Apr 20, 2021 · f62c2e1 · f62c2e1
1 parent 5b3298a
commit f62c2e1
Showing 1 changed file with 6 additions and 20 deletions.
diff --git a/.github/workflows/dev_pr.yml b/.github/workflows/dev_pr.yml
@@ -18,15 +18,7 @@
 name: Dev PR
 
 on:
-  # TODO: Enable this when eps1lon/actions-label-merge-conflict is available.
-  # push:
-  #   branches:
-  #     - master
-  pull_request_target:
-    types:
-      - opened
-      - edited
-      - synchronize
+  pull_request:
 
 jobs:
   process:
@@ -46,14 +38,8 @@ jobs:
           configuration-path: .github/workflows/dev_pr/labeler.yml
           sync-labels: true
 
-      # TODO: Enable this when eps1lon/actions-label-merge-conflict is available.
-      # - name: Checks if PR needs rebase
-      #   if: |
-      #     github.event_name == 'push' ||
-      #     (github.event_name == 'pull_request_target' &&
-      #        (github.event.action == 'opened' ||
-      #         github.event.action == 'synchronize'))
-      #   uses: eps1lon/actions-label-merge-conflict@releases/2.x
-      #   with:
-      #     dirtyLabel: "needs-rebase"
-      #     repoToken: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Checks if PR needs rebase
+        uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        with:
+          dirtyLabel: "needs-rebase"
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"