Skip to content

Commit

Permalink
Merge pull request #13 from thomaseizinger/release/1.2.0
Browse files Browse the repository at this point in the history
Release version 1.2.0
  • Loading branch information
thomaseizinger committed Feb 17, 2020
2 parents 109f759 + 80cdd73 commit 7a88e68
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/draft-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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: |
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/publish-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "github-action-gitflow-release-workflow",
"version": "1.1.0",
"version": "1.2.0",
"main": "index.js",
"author": "Thomas Eizinger <thomas@eizinger.io>",
"license": "MIT",
Expand Down

0 comments on commit 7a88e68

Please sign in to comment.