diff --git a/.github/workflows/draft-new-release.yml b/.github/workflows/draft-new-release.yml index e0a4883..b382050 100644 --- a/.github/workflows/draft-new-release.yml +++ b/.github/workflows/draft-new-release.yml @@ -6,6 +6,7 @@ on: jobs: draft-new-release: + name: "Draft a new release" runs-on: ubuntu-latest if: startsWith(github.event.issue.title, 'Release version') && contains(github.event.issue.labels.*.name, 'release') # only run for issues with a specific title and label steps: @@ -33,7 +34,7 @@ jobs: # This step will differ depending on your project setup - name: Bump version in package.json - run: yarn version --new-version ${{ env.RELEASE_VERSION }} + run: yarn version --new-version ${{ env.RELEASE_VERSION }} --no-git-tag-version - name: Commit changelog and manifest files run: | diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml index ba5ac1c..7a07101 100644 --- a/.github/workflows/publish-new-release.yml +++ b/.github/workflows/publish-new-release.yml @@ -45,6 +45,5 @@ jobs: head: release/${{ env.RELEASE_VERSION }} base: dev title: Merge release ${{ env.RELEASE_VERSION }} into dev branch - reviewers: ${{ github.event.pull_request.user.login }} # if needed, you can checkout the latest master here, build artifacts and publish / deploy them somewhere diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b830a7..f0520ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.2.0] - 2020-02-17 + +### Changed + +- Don't request reviews from pull request author for merging release branch back into dev. + The author of the PR is github-actions[bot], we can request a review from them. +- Don't make a separate commit for updating the version of package.json + ## [1.1.0] - 2020-02-17 ### Added @@ -23,7 +31,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Everything since the beginning! -[Unreleased]: https://github.com/thomaseizinger/github-action-gitflow-release-workflow/compare/1.1.0...HEAD +[Unreleased]: https://github.com/thomaseizinger/github-action-gitflow-release-workflow/compare/1.2.0...HEAD + +[1.2.0]: https://github.com/thomaseizinger/github-action-gitflow-release-workflow/compare/1.1.0...1.2.0 [1.1.0]: https://github.com/thomaseizinger/github-action-gitflow-release-workflow/compare/1.0.0...1.1.0 diff --git a/package.json b/package.json index 589d15c..daa533e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "github-action-gitflow-release-workflow", - "version": "1.1.0", + "version": "1.2.0", "main": "index.js", "author": "Thomas Eizinger ", "license": "MIT",