Skip to content

Commit

Permalink
PR: Add automerge workflow for automatic merges (CI) (#22600)
Browse files Browse the repository at this point in the history
[ci skip]
  • Loading branch information
ccordoba12 authored Sep 27, 2024
1 parent 6866c13 commit 4af13c2
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 0 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Automerge

on:
pull_request:
types:
- labeled
- unlabeled
- synchronize
- opened
- edited
- ready_for_review
- reopened
- unlocked
check_suite:
types:
- completed
status: {}

jobs:
automerge:
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
steps:
- id: automerge
name: Automerge
uses: "pascalgn/automerge-action"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_LABELS: "automerge"
MERGE_REMOVE_LABELS: "automerge"
MERGE_METHOD: "squash"
BASE_BRANCHES: "6.x"
2 changes: 2 additions & 0 deletions .github/workflows/test-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
- '!installers-conda/**'
- '!.github/workflows/installers-conda.yml'
- '!.github/workflows/build-subrepos.yml'
- '!.github/workflows/automerge.yml'

pull_request:
branches:
Expand All @@ -34,6 +35,7 @@ on:
- '!installers-conda/**'
- '!.github/workflows/installers-conda.yml'
- '!.github/workflows/build-subrepos.yml'
- '!.github/workflows/automerge.yml'

workflow_dispatch:

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
- '!installers-conda/**'
- '!.github/workflows/installers-conda.yml'
- '!.github/workflows/build-subrepos.yml'
- '!.github/workflows/automerge.yml'

pull_request:
branches:
Expand All @@ -34,6 +35,7 @@ on:
- '!installers-conda/**'
- '!.github/workflows/installers-conda.yml'
- '!.github/workflows/build-subrepos.yml'
- '!.github/workflows/automerge.yml'

workflow_dispatch:
inputs:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
- '!installers-conda/**'
- '!.github/workflows/installers-conda.yml'
- '!.github/workflows/build-subrepos.yml'
- '!.github/workflows/automerge.yml'

pull_request:
branches:
Expand All @@ -34,6 +35,7 @@ on:
- '!installers-conda/**'
- '!.github/workflows/installers-conda.yml'
- '!.github/workflows/build-subrepos.yml'
- '!.github/workflows/automerge.yml'

workflow_dispatch:
inputs:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
- '!installers-conda/**'
- '!.github/workflows/installers-conda.yml'
- '!.github/workflows/build-subrepos.yml'
- '!.github/workflows/automerge.yml'

pull_request:
branches:
Expand All @@ -34,6 +35,7 @@ on:
- '!installers-conda/**'
- '!.github/workflows/installers-conda.yml'
- '!.github/workflows/build-subrepos.yml'
- '!.github/workflows/automerge.yml'

workflow_dispatch:
inputs:
Expand Down

0 comments on commit 4af13c2

Please sign in to comment.