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

R4R: Simplify version handling, rely on git describe #2318

Merged
merged 7 commits into from
Sep 19, 2018

Conversation

alessio
Copy link
Contributor

@alessio alessio commented Sep 12, 2018

Simplify version handling, rely on git describe

Closes: #1941

  • Linked to github-issue with discussion and accepted design OR link to spec that describes this work.
  • Wrote tests
  • Updated relevant documentation (docs/)
  • Added entries in PENDING.md with issue #
  • rereviewed Files changed in the github PR explorer

For Admin Use:

  • Added appropriate labels to PR (ex. wip, ready-for-review, docs)
  • Reviewers Assigned
  • Squashed all commits, uses message "Merge pull request #XYZ: [title]" (coding standards)

@alessio alessio changed the title Simplify version handling, rely on git describe #1941 Simplify version handling, rely on git describe Sep 12, 2018
@alessio alessio changed the title Simplify version handling, rely on git describe WIP: Simplify version handling, rely on git describe Sep 12, 2018
@alessio alessio added the wip label Sep 12, 2018
@cwgoes
Copy link
Contributor

cwgoes commented Sep 17, 2018

I think this is an excellent idea but cc @greg-szabo are we still parsing version/version.go manually?

@greg-szabo
Copy link
Member

We do, but we don't build automated gaiad builds anymore. When we decide to do it again, we'll have to rewrite/fix the automation. Feel free to go ahead with this change.

Historically (I mean in the Tendermint repo) we only tagged the code when a new release was cut. I guess with moving the version information into tags, you want to change that process? (I couldn't make the team immediately update the version number on develop when a new release was deployed.)

In Tendermint, the automated release also creates a tag on master, I wonder if that becomes available in develop too.

@alessio
Copy link
Contributor Author

alessio commented Sep 17, 2018

@greg-szabo dixit:

I guess with moving the version information into tags, you want to change that process?

No, we don't want to. This is all about providing develop builds with numeric versioning schema

@greg-szabo
Copy link
Member

The change I'm thinking of is that when you deploy a release to master, you have to add a new tag to develop at least... (So the master deployments version number is the tag that was created on develop during the previous release - or something newer than that).

@codecov
Copy link

codecov bot commented Sep 19, 2018

Codecov Report

Merging #2318 into develop will decrease coverage by 1.07%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           develop   #2318      +/-   ##
==========================================
- Coverage    64.97%   63.9%   -1.08%     
==========================================
  Files          135     140       +5     
  Lines         8418    8714     +296     
==========================================
+ Hits          5470    5569      +99     
- Misses        2587    2766     +179     
- Partials       361     379      +18

@alessio alessio changed the title WIP: Simplify version handling, rely on git describe R4R: Simplify version handling, rely on git describe Sep 19, 2018
Makefile Show resolved Hide resolved
client/lcd/lcd_test.go Show resolved Hide resolved
@cwgoes
Copy link
Contributor

cwgoes commented Sep 19, 2018

Odd CI failures, possibly unrelated to this PR?

Copy link
Contributor

@cwgoes cwgoes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested ACK

@cwgoes cwgoes merged commit 10b916e into develop Sep 19, 2018
@cwgoes cwgoes deleted the alessio/1941-git-describe branch September 19, 2018 16:03
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.

3 participants