search

platformio / platform-lattice_ice40

Lattice iCE40: development platform for PlatformIO
https://registry.platformio.org/platforms/platformio/lattice_ice40
Apache License 2.0
39 stars 15 forks source link

Ready for 1.1.0 #5

Closed Jesus89 closed 8 years ago

Jesus89 commented 8 years ago

Hi,

I have created the release/v1.1.0:

Tests passed. Can I merge in master?

ivankravets commented 8 years ago

I recommend using git-flow that manages releases/features automatically.

  1. Remove manually created release branch
  2. Switch to develop branch
  3. Start new release
  4. Increase platform version in platform.json manifest. Commit
  5. Finish release

git-flow will do rest work automatically.

ivankravets commented 8 years ago

Also, I can make releases if you don't want to paly with this git-flow.

Jesus89 commented 8 years ago

Great. git-flow is a nice way.

I can manage releases. Thanks!

ivankravets commented 8 years ago

Do you need any help?

Jesus89 commented 8 years ago

I have created the release, but develop branch has been merged from master instead of release/v1.1.0. Is there a git-flow configuration to enable merging develop from release branch?

ivankravets commented 8 years ago

Have you done these steps? https://github.com/platformio/platform-lattice_ice40/issues/5#issuecomment-251194473

You should start all work from develop, not master. You should not touch master. git-flow will automatically merge changes to master and rebase develop to the latest commit.

ivankravets commented 8 years ago

Nice! It looks that you forgot to push tag to remote.

Jesus89 commented 8 years ago

Yes. Tag pushed: https://github.com/platformio/platform-lattice_ice40/releases/tag/v1.1.0.

ivankravets commented 8 years ago

Thank you! 👍 😊

Jesus89 commented 8 years ago

I can not understand why develop is merged from master instead of the release branch.

$ git flow release start 'v1.1.0'
Switched to a new branch 'release/v1.1.0'

Summary of actions:
- A new branch 'release/v1.1.0' was created, based on 'develop'
- You are now on branch 'release/v1.1.0'

Follow-up actions:
- Bump the version number now!
- Start committing last-minute fixes in preparing your release
- When done, run:

     git flow release finish 'v1.1.0'
$ git flow release finish 'v1.1.0'
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
Merge made by the 'recursive' strategy.
...
Switched to branch 'develop'
Your branch is up-to-date with 'origin/develop'.
Merge made by the 'recursive' strategy.
...
Deleted branch release/v1.1.0 (was fdb7e14).

Summary of actions:
- Release branch 'release/v1.1.0' has been merged into 'master'
- The release was tagged 'v1.1.0'
- Release tag 'v1.1.0' has been back-merged into 'develop'
- Release branch 'release/v1.1.0' has been locally deleted
- You are now on branch 'develop'
ivankravets commented 8 years ago

Please read http://nvie.com/posts/a-successful-git-branching-model/

master branch is used ONLY for RELEASES. We should not code here. The latest branch is develop.

Jesus89 commented 8 years ago

Yes. I know that. I mean about git-flow automatic tasks. I will investigate that.

Jesus89 commented 8 years ago

The issue I have observed depends on the git-flow version. My git-flow (apt installed) version has different behavior than yours. Simply that.

Jesus89 commented 8 years ago

Fixed using:

$ git config --global gitflow.release.finish.nobackmerge yes

https://github.com/petervanderdoes/gitflow-avh/blob/develop/git-flow-release#L136