Skip to content

Commit

Permalink
Merge pull request #188 from neild3r/auto-merge-release-pr
Browse files Browse the repository at this point in the history
Auto merge release PR
  • Loading branch information
neild3r committed Sep 7, 2021
2 parents bb434b8 + 84b7c97 commit e1f6560
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 3 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/prepare-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,10 @@ jobs:
branch: releases/${{ env.npm_package_version }}
body: ${{ env.release_notes }}
labels: release candidate

- name: Enable Pull Request Automerge
if: steps.create-pull-request.outputs.pull-request-operation == 'created'
uses: peter-evans/enable-pull-request-automerge@v1
with:
token: ${{ secrets.BOT_GITHUB_PAT }}
pull-request-number: ${{ steps.create-pull-request.outputs.pull-request-number }}
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,9 @@ jobs:
artifacts: ./out/package.vsix
body: ${{ github.event.pull_request.body }}
tag: v${{ steps.extract_version.outputs.version }}
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.BOT_GITHUB_PAT }}

- name: Publish
run: npm run publish
env:
VSCE_PAT: ${{ secrets.VSCE_PAT }}

2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Test Suite
on: [push, pull_request]
on: push

jobs:
test:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
All notable changes to the "php-docblocker" extension will be documented in this file.

## [Unreleased]
- Add auto-merge to release workflow
- Create release using bot token
- Make tests run on push only

## [2.4.0] - 2021-09-05
- Add support for params which have a trailing comma
Expand Down

0 comments on commit e1f6560

Please sign in to comment.