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

version: revert version through ldflag only #6494

Merged
merged 12 commits into from
May 28, 2021
Merged

version: revert version through ldflag only #6494

merged 12 commits into from
May 28, 2021

Conversation

tac0turtle
Copy link
Contributor

@tac0turtle tac0turtle commented May 26, 2021

Description

Add version back to versions, but allow it to be overridden via a ldflag.

Reason:

Many users are not setting the ldflag causing issues with tooling that relies on it (cosmjs)

closes #6488

cc @webmaster128

@tac0turtle tac0turtle self-assigned this May 26, 2021
@codecov
Copy link

codecov bot commented May 26, 2021

Codecov Report

Merging #6494 (10fbfcf) into master (97202b0) will decrease coverage by 0.26%.
The diff coverage is 75.00%.

@@            Coverage Diff             @@
##           master    #6494      +/-   ##
==========================================
- Coverage   61.02%   60.76%   -0.27%     
==========================================
  Files         292      292              
  Lines       27319    27319              
==========================================
- Hits        16672    16600      -72     
- Misses       8953     9020      +67     
- Partials     1694     1699       +5     
Impacted Files Coverage Δ
cmd/tendermint/commands/version.go 0.00% <0.00%> (ø)
state/state.go 85.09% <ø> (ø)
node/setup.go 70.43% <100.00%> (ø)
consensus/reactor.go 65.89% <0.00%> (-4.94%) ⬇️
blockchain/v0/pool.go 77.18% <0.00%> (-4.19%) ⬇️
consensus/peer_state.go 78.94% <0.00%> (-3.08%) ⬇️
p2p/pex/reactor.go 81.72% <0.00%> (-3.05%) ⬇️
p2p/switch.go 61.12% <0.00%> (-3.05%) ⬇️
privval/signer_endpoint.go 75.75% <0.00%> (-3.04%) ⬇️
blockchain/v2/routine.go 63.38% <0.00%> (-2.82%) ⬇️
... and 11 more

@tac0turtle tac0turtle changed the title version: revert release ldflag version: revert version through ldflag only May 26, 2021
@tac0turtle tac0turtle marked this pull request as ready for review May 26, 2021 16:11
Makefile Outdated Show resolved Hide resolved
version/version.go Outdated Show resolved Hide resolved
Co-authored-by: Callum Waters <cmwaters19@gmail.com>
CONTRIBUTING.md Outdated Show resolved Hide resolved
CONTRIBUTING.md Outdated Show resolved Hide resolved
tac0turtle and others added 2 commits May 27, 2021 12:24
Co-authored-by: Callum Waters <cmwaters19@gmail.com>
Co-authored-by: Callum Waters <cmwaters19@gmail.com>
Copy link
Contributor

@cmwaters cmwaters left a comment

Choose a reason for hiding this comment

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

👍

@tac0turtle
Copy link
Contributor Author

@tessr as this mainly effects your work on releases, I'd like to get your sign off before merging.

Copy link
Contributor

@tessr tessr left a comment

Choose a reason for hiding this comment

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

LGTM, thank you! This should probably also get backported to 0.34.x, right?

@tac0turtle tac0turtle added S:backport-to-v0.34.x Tell mergify to backport the PR to v0.34.x S:automerge Automatically merge PR when requirements pass labels May 28, 2021
@mergify mergify bot merged commit 1709e49 into master May 28, 2021
@mergify mergify bot deleted the version_revert branch May 28, 2021 14:22
tac0turtle added a commit that referenced this pull request May 28, 2021
Add version back to versions, but allow it to be overridden via a ldflag.

Reason:

Many users are not setting the ldflag causing issues with tooling that relies on it (cosmjs)

closes #6488

cc @webmaster128
tac0turtle added a commit that referenced this pull request May 28, 2021
Add version back to versions, but allow it to be overridden via a ldflag.

Reason:

Many users are not setting the ldflag causing issues with tooling that relies on it (cosmjs)

closes #6488

cc @webmaster128
tac0turtle added a commit that referenced this pull request May 31, 2021
* version: revert version through ldflag only (#6494)

Add version back to versions, but allow it to be overridden via a ldflag.

Reason:

Many users are not setting the ldflag causing issues with tooling that relies on it (cosmjs)

closes #6488

cc @webmaster128

* revert variable rename

* Update CHANGELOG_PENDING.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S:automerge Automatically merge PR when requirements pass S:backport-to-v0.34.x Tell mergify to backport the PR to v0.34.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

/status endpoint returns empty version
4 participants