Merge branch 'main' into dependabot/github_actions/actions/checkout-3

This commit is contained in:
Ben Ramsey
2022-03-26 16:17:55 -05:00
committed by GitHub
18 changed files with 6743 additions and 68 deletions
@@ -60,9 +60,6 @@ jobs:
fail-fast: false
matrix:
php-version:
- "7.2"
- "7.3"
- "7.4"
- "8.0"
- "8.1"
@@ -128,9 +125,6 @@ jobs:
fail-fast: false
matrix:
php-version:
- "7.2"
- "7.3"
- "7.4"
- "8.0"
- "8.1"
operating-system:
@@ -0,0 +1,23 @@
# See https://github.com/ridedott/merge-me-action/
# This workflow automates merges from patches sent by Dependabot, and
# only by dependabot, once the other CI workflows pass
name: Auto-merge Dependabot PRs
on:
workflow_run:
types:
- completed
workflows:
- "build"
jobs:
merge-me:
name: Auto-merge Dependabot PRs
runs-on: ubuntu-latest
steps:
- name: Auto-Merge
if: ${{ github.event.workflow_run.conclusion == 'success' }}
uses: ridedott/merge-me-action@v2
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MERGE_METHOD: MERGE