Skip to content

Commit

Permalink
Merge pull request #132 from na2na-p/develop
Browse files Browse the repository at this point in the history
1.1.1.4
  • Loading branch information
2na2-p[bot] authored Oct 31, 2022
2 parents 161db9a + 238e5cd commit fd8b769
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
26 changes: 26 additions & 0 deletions .github/workflows/enable-auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Enable auto merge
on:
pull_request:
types:
- opened
- reopened
branches:
- main
- develop
- na2na

jobs:
enable-auto-merge:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Generate github token
id: generate_token
uses: ./.github/actions/github-app-token
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.PRIVATE_KEY }}
- uses: alexwilson/enable-github-automerge-action@main
with:
github-token: ${{ steps.generate_token.outputs.token }}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "2na2-discord",
"version": "1.1.1.3",
"version": "1.1.1.4",
"main": "built/index.js",
"private": true,
"author": "na2na",
Expand Down

0 comments on commit fd8b769

Please sign in to comment.