Skip to content

Commit f392eef

Browse files
authored
Merge pull request #89 from wayofdev/feat/auto-merge
2 parents c4000bf + 0450f0f commit f392eef

File tree

4 files changed

+36
-8
lines changed

4 files changed

+36
-8
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
3+
# https://github.com/peter-evans/enable-pull-request-automerge
4+
5+
on: # yamllint disable-line rule:truthy
6+
pull_request:
7+
8+
permissions:
9+
pull-requests: write
10+
contents: write
11+
12+
name: 🤞 Auto merge release
13+
14+
jobs:
15+
auto-merge:
16+
if: github.actor == 'lotyp' && startsWith(github.head_ref, 'release-please--')
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: 🤞 Auto-merge pull request
20+
uses: peter-evans/enable-pull-request-automerge@v2
21+
with:
22+
pull-request-number: ${{ github.event.pull_request.number }}
23+
merge-method: merge
24+
# to trigger other workflows, pass PAT token instead of GITHUB_TOKEN
25+
token: ${{ secrets.GITHUB_TOKEN }}
26+
27+
...

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ name: 🔍 Continuous integration
1212

1313
jobs:
1414
integration:
15-
name: 🧪 Testing on PHP ${{ matrix.php }} - ${{ matrix.os }}
1615
runs-on: ${{ matrix.os }}
1716
strategy:
1817
fail-fast: true
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@ on: # yamllint disable-line rule:truthy
1010
name: 📦 Create release
1111

1212
jobs:
13-
release-please:
13+
create-release:
1414
runs-on: ubuntu-latest
1515
steps:
16-
1716
- name: 🎉 Create release
1817
uses: google-github-actions/release-please-action@v3
1918
id: release
2019
with:
21-
token: ${{ secrets.GITHUB_TOKEN }}
20+
token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
2221
release-type: node
2322
package-name: php-cs-fixer-config
2423
default-branch: master

.github/workflows/label.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
---
2+
23
# This workflow will triage pull requests and apply a label based on the
34
# paths that are modified in the pull request.
45
#
56
# To use this workflow, you will need to set up a .github/labeler.yml
67
# file with configuration. For more information, see:
78
# https://github.com/actions/labeler/blob/master/README.md
89

9-
name: 🏷️ Add labels
10-
11-
on: # yamllint disable-line rule:truthy
10+
on: # yamllint disable-line rule:truthy
1211
pull_request:
1312

13+
name: 🏷️ Apply labels
14+
1415
jobs:
1516
label:
1617
runs-on: ubuntu-latest
1718
steps:
1819
- name: 🏷️ Apply labels
1920
uses: actions/labeler@v4
2021
with:
21-
repo-token: '${{ secrets.GITHUB_TOKEN }}'
22+
repo-token: ${{ secrets.GITHUB_TOKEN }}
23+
24+
...

0 commit comments

Comments
 (0)