diff --git a/.github/workflows/enable-auto-merge.yml b/.github/workflows/enable-auto-merge.yml new file mode 100644 index 00000000..f9da9c59 --- /dev/null +++ b/.github/workflows/enable-auto-merge.yml @@ -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 }} diff --git a/package.json b/package.json index 73626b0e..20cd8e1b 100644 --- a/package.json +++ b/package.json @@ -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",