ci: Enforce rebasing PRs before merging

Replaces the old, broken action

diff --git a/.github/workflows/block-merge-commits.yml b/.github/workflows/block-merge-commits.yml
deleted file mode 100644 (file)
index 8af5761..0000000
--- a/.github/workflows/block-merge-commits.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-on: pull_request
-
-name: Pull Requests
-
-jobs:
-  message-check:
-    name: Block Merge or Autosquash Commits
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Block Merge or Autosquash Commits
-        uses: nineinchnick/block-commits-action@v2.1.0
-        with:
-          action-merge: fail
-          action-fixup: request-changes

diff --git a/.github/workflows/enforce-pr-rebase.yml b/.github/workflows/enforce-pr-rebase.yml
new file mode 100644 (file)
index 0000000..5c179be
--- /dev/null
+++ b/.github/workflows/enforce-pr-rebase.yml
@@ -0,0 +1,16 @@
+name: Enforce Rebasing
+
+on: [push]
+
+jobs:
+  rebase_job:
+    runs-on: ubuntu-latest
+    name: Enforce rebasing
+
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Is Rebased on master?
+      uses: cyberark/enforce-rebase@v2