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.

Sign up for GitHub

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

build: automatically merge dependabot PRs on dependencies branch (if they pass tests) #2798

Merged
merged 7 commits into from
Jan 17, 2025
Merged

build: automatically merge dependabot PRs on dependencies branch (if they pass tests) #2798

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c33dd01
build: enable auto-merge for dependabot PRs
paulschreiber Jan 9, 2025
bbca31a
build: create a new dependencies branch each week
paulschreiber Jan 9, 2025
95a8f06
fix: move permissions key to top of auto-approve job
paulschreiber Jan 9, 2025
dd644eb
fix: create dependencies branch on Saturdays
paulschreiber Jan 9, 2025
de5efae
build: fix spelling of dependencies
paulschreiber Jan 12, 2025
64d72b8
fix: correct spelling of dependencies
paulschreiber Jan 16, 2025
2ba8449
fix: only create new dependencies branch when old one is closed/merged
paulschreiber Jan 16, 2025
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
5 changes: 3 additions & 2 deletions .github/workflows/auto-approve.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ name: Auto approve

on: pull_request_target

permissions:
pull-requests: write

jobs:
auto-approve:
runs-on: ubuntu-latest
permissions:
pull-requests: write
if: github.actor == 'dependabot[bot]'
steps:
- uses: hmarr/auto-approve-action@v4
17 changes: 17 additions & 0 deletions .github/workflows/auto-merge.yml
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: Could add a comment here that the auto-merge still gates on the build/test workflow succeeding

Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Dependabot auto-merge

on: pull_request

permissions:
contents: write
pull-requests: write

jobs:
dependabot:
runs-on: ubuntu-latest
if: github.actor == 'dependabot[bot]' && github.ref == 'refs/heads/dependencies'
steps:
- name: Enable auto-merge for Dependabot PRs
run: gh pr merge --auto --merge ${{ github.event.pull_request.number }}
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
20 changes: 20 additions & 0 deletions .github/workflows/dependencies-branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Dependabot auto-merge

on:
schedule:
- cron: "0 2 * * 6"
paulschreiber marked this conversation as resolved.
Show resolved Hide resolved

permissions:
contents: write
pull-requests: write

jobs:
dependabot:
runs-on: ubuntu-latest
steps:
- name: Create dependencies branch
uses: peterjgrainger/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
branch: "dependencies"
Loading