Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
12 changes: 8 additions & 4 deletions .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@ permissions:

jobs:
auto-merge:
name: Auto-merge
name: Auto-merge dependabot pull requests
runs-on: ubuntu-latest
if: github.actor == 'dependabot[bot]'

steps:
- name: Approve
run: gh pr review "$PR_URL" --approve --comment --body "Auto-approve Dependabot pull requests"
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GH_TOKEN: ${{ secrets.LOCALSTACK_BOT_TOKEN }}
- name: Enable auto-merge
run: gh pr merge --auto --squash "$PR_URL"
run: gh pr merge "$PR_URL" --auto --squash
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.LOCALSTACK_BOT_TOKEN }}
5 changes: 3 additions & 2 deletions .github/workflows/release-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ permissions:

jobs:
auto-merge:
name: Enable auto-merge on release PRs
name: Auto-merge release pull requests
runs-on: ubuntu-latest
steps:
- name: Enable auto-merge on release PRs
- name: Find release pull request, approve and enable auto-merge
env:
GH_TOKEN: ${{ secrets.LOCALSTACK_BOT_TOKEN }}
GH_REPO: ${{ github.repository }}
Expand All @@ -26,5 +26,6 @@ jobs:
--jq '.[].number' | \
while read -r pr; do
echo "Enabling auto-merge on PR #$pr"
gh pr review "$pr" --approve --comment --body "Auto-approve weekly releases"
gh pr merge "$pr" --auto --squash
done
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ jobs:
- uses: googleapis/release-please-action@v4
id: release
with:
token: ${{ secrets.LOCALSTACK_BOT_TOKEN }}
release-type: node

build:
Expand Down
Loading