ci: migrate to new autorebase strategy (#26)

.circleci/config.yml

@@ -1,13 +1,5 @@
 version: 2.1
 
-# Reusable YAML chunks
-defaults:
-  autorebase_filters: &autorebase_filters
-    branches:
-      ignore:
-        - /rebase-pull-request-.*/
-        - /cherry-pick-rebase-pull-request-.*/
-
 orbs:
   vfcommon: voiceflow/common@0.0.187
 
@@ -27,9 +19,7 @@ workflows:
     jobs:
       - build-and-test:
           context: dev-test
-          filters:
-            <<: *autorebase_filters
-
+
       - vfcommon/release:
           context: dev-test
           requires:

.github/workflows/rebase.yaml

@@ -0,0 +1,32 @@
+# Keeps the current branch up-to-date by rebasing to master when necessary
+name: Automatic Rebase
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+jobs:
+  rebase-to-master:
+    name: Rebase to Master
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the latest code
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
+
+      - name: Find Pull Request
+        id: find-pr
+        uses: kylorhall/find-github-pull-request@v1.0.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commitSha: ${{ github.sha }}
+          allowClosed: false
+          failIfNotFound: false
+
+      - name: Rebase Pull Request
+        if: ${{ steps.find-pr.outputs.number != '' }}
+        uses: voiceflow/rebase-many@v1.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_NUMBERS: ${{ steps.find-pr.outputs.number }}

.github/workflows/rebase_all.yaml

@@ -0,0 +1,17 @@
+# Keeps all incoming branches up-to-date by rebasing to master when necessary
+name: Automatic Rebase All Branches
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  # When master updates, rebase all open pull requests
+  rebase-all-to-master:
+    name: Rebase All to Master
+    runs-on: ubuntu-latest
+    steps:
+      - name: Rebase All Incoming PRs
+        uses: voiceflow/rebase-incoming@v1.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          comment-on-failure: 'true'