Skip to content
This repository was archived by the owner on Oct 10, 2023. It is now read-only.

Commit 36ae144

Browse files
authored
Revert "Rework auto-merge for Steward's PRs. (#337)" (#338)
This reverts commit 985cf8e.
1 parent 985cf8e commit 36ae144

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Scala Steward automatic merge
2+
on: pull_request
3+
4+
permissions:
5+
contents: write
6+
pull-requests: write
7+
8+
jobs:
9+
scala-steward-auto-merge:
10+
runs-on: ubuntu-latest
11+
if: ${{ github.actor == 'scala-steward-for-moia[bot]' }}
12+
steps:
13+
- name: Enable auto-merge for Scala Steward PRs
14+
run: gh pr merge --auto --squash "$PR_URL"
15+
env:
16+
PR_URL: ${{github.event.pull_request.html_url}}
17+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/scala-steward.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,10 @@ jobs:
1515
with:
1616
app_id: 162267
1717
private_key: ${{ secrets.SCALA_STEWARD_APP_PRIVATE_KEY }}
18+
1819
- name: Launch Scala Steward
1920
uses: scala-steward-org/scala-steward-action@v2
2021
with:
2122
github-token: ${{ steps.generate-token.outputs.token }}
2223
author-name: scala-steward
2324
author-email: 162267+scala-steward-for-moia[bot]@users.noreply.github.com
24-
- name: Enable auto-merge
25-
run: gh pr merge --auto --squash "$PR_URL"
26-
env:
27-
PR_URL: ${{github.event.pull_request.html_url}}
28-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

0 commit comments

Comments
 (0)