Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release procedure for branches and some javadoc #627

Merged
merged 31 commits into from Sep 9, 2016
Merged

Conversation

mockitoguy
Copy link
Member

Sorry for the amount of commits. It happened due to merging. Please squash when applying the change.

Fixes #594 - now it should be possible to release from branches. It worked for the release/test branch so it should work for release/2.x :)

mockitoguy and others added 29 commits September 6, 2016 06:31
Ensured it is possible to release from release branches.
v2.1.0-beta.121 is in bintray/central but does not have docs / release notes due to this bug

After 2.1.0 is out I will overhaul the release logic and make it perfect :D
Otherwise I was confused with bintrayUpload task behavior.
I found an idea to test the release without spoling the release/2.x branch
Testing the release logic is hard. We need to make it easier!
 - removed 2.0 version
 - small change that allows me to test releasing from release/test branch
  - removed 2.0 version, added TODO for tomorrow
  - small change that allows me to test releasing from release/test branch
(release process tweaking)
Ensured it is possible to release from release branches.
v2.1.0-beta.121 is in bintray/central but does not have docs / release notes due to this bug

After 2.1.0 is out I will overhaul the release logic and make it perfect :D
Otherwise I was confused with bintrayUpload task behavior.
I found an idea to test the release without spoling the release/2.x branch
 - removed 2.0 version
 - small change that allows me to test releasing from release/test branch
  - removed 2.0 version, added TODO for tomorrow
  - small change that allows me to test releasing from release/test branch
v2.1.0-beta.121 is in bintray/central but does not have docs / release notes due to this bug

After 2.1.0 is out I will overhaul the release logic and make it perfect :D
Otherwise I was confused with bintrayUpload task behavior.
I found an idea to test the release without spoling the release/2.x branch
…e/test

Conflicts:
	doc/release-notes/official.md
@codecov-io
Copy link

codecov-io commented Sep 8, 2016

Current coverage is 88.24% (diff: 100%)

Merging #627 into master will decrease coverage by 0.01%

@@             master       #627   diff @@
==========================================
  Files           266        266          
  Lines          5163       5163          
  Methods           0          0          
  Messages          0          0          
  Branches        847        847          
==========================================
- Hits           4557       4556     -1   
  Misses          429        429          
- Partials        177        178     +1   

Sunburst

Powered by Codecov. Last update 9b08c08...54394ee

@bric3
Copy link
Contributor

bric3 commented Sep 8, 2016

LGTM

@bric3
Copy link
Contributor

bric3 commented Sep 8, 2016

Sorry for the amount of commits. It happened due to merging.

@szczepiq I try to avoid merges outside of merging feature branch. You may be interested by

  • A simple git rebase origin/master to move your commits on top of the latest master changes (instead of merging master in the feature branch)
  • The 3 arg form of git rebase --onto <new parent> <old parent> <wanted reference name> to move commits of the current branch on another parent

@mockitoguy mockitoguy merged commit 15cf231 into master Sep 9, 2016
@mockitoguy
Copy link
Member Author

Thanks @bric3, I'll check this strategy next time I'm in branching trouble.

@bric3 bric3 deleted the release/test branch September 9, 2016 07:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants