Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed automerge dependabot's PRs #4271

Merged
merged 2 commits into from
Jan 15, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}


# `automerge` label is attached iff there is exactly one file changed by steward and this file belongs to a
# `automerge` label is attached if there is exactly one file changed by steward and this file belongs to a
# whitelist specified by `labeler.yml`
label:
name: Attach automerge label
Expand All @@ -216,16 +216,29 @@ jobs:
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

auto-merge:
name: Auto merge
# only for PRs by softwaremill-ci and dependabot
if: github.event.pull_request.user.login == 'softwaremill-ci' ||
github.event.pull_request.user.login == 'dependabot[bot]'
auto-merge-softwaremill-ci:
name: Auto merge softwaremill-ci
# only for PRs by softwaremill-ci
if: github.event.pull_request.user.login == 'softwaremill-ci'
needs: [ ci, mima, label ]
runs-on: ubuntu-24.04
steps:
- id: automerge
name: automerge
- id: automerge-softwaremill-ci
name: automerge-softwaremill-ci
uses: "pascalgn/automerge-action@v0.16.4"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_METHOD: "squash"

auto-merge-dependabot:
sergiuszkierat marked this conversation as resolved.
Show resolved Hide resolved
name: Auto merge dependabot
# only for PRs by dependabot
if: github.event.pull_request.user.login == 'dependabot[bot]'
needs: [ ci, mima ]
runs-on: ubuntu-24.04
steps:
- id: automerge-dependabot
name: automerge-dependabot
uses: "pascalgn/automerge-action@v0.16.4"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
Expand Down
Loading