Merge master into dependabot/npm_and_yarn/minimist-1.2.8

openactive · Sep 15, 2023 · 3af22dc · 3af22dc
2 parents 7a56519 + 76068ea
commit 3af22dc
Show file tree

Hide file tree

Showing 3 changed files with 6,136 additions and 2,246 deletions.
diff --git a/.github/workflows/pr-base-merge.yml b/.github/workflows/pr-base-merge.yml
@@ -0,0 +1,23 @@
+name: Merge base branch into PRs
+
+on:
+  push:
+    branches:
+    # Automatically merge main/master branch into PR local branch.
+    - master
+
+jobs:
+  merge:
+    name: PR base merge
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 1
+    steps:
+    - name: PR base merge
+      uses: deliveryhero/pr-base-auto-merger@main
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        # Delay in seconds between consecutive merges
+        MERGE_DELAY: 5
+        # Label of PRs for which base can be merged. Use '*' to include all open PRs.
+        MERGE_LABEL: '*'