Skip to content

Commit

Permalink
Use master as default branch (#229)
Browse files Browse the repository at this point in the history
* Draft releases from master

* Update release instructions

* Clean up
  • Loading branch information
MartinHjelmare authored Mar 12, 2020
1 parent fc9df24 commit 6479809
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/draft-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
# branches to consider in the event; optional, defaults to all
branches:
- dev
- master

jobs:
update-release-draft:
Expand Down
9 changes: 4 additions & 5 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@
pip3 install -r requirements_pypi.txt
```

- Create a release branch from dev.
- Merge master into the release branch to make the PR mergeable.
- Create a release branch from `master`.
- Update version in `mysensors/VERSION` to the new version number, eg `'0.2.0'`.
- Commit with commit message `Bump version to 0.2.0` and push the release branch to origin.
- Create a pull request from release branch to `master` with the commit message as title.
- Merge the pull request into master, do not squash.
- Squash merge the pull request into `master`.
- Wait for all GitHub actions to have run successfully.
- Go to github releases and tag a new release on the master branch.
- Fetch and checkout the master branch.
- Go to GitHub releases page and publish the current draft release, setting the correct title and tag version from `master` branch. Do not use a `v` prefix for the tag.
- Fetch and checkout the `master` branch.
- Stage release:

```sh
Expand Down

0 comments on commit 6479809

Please sign in to comment.