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.

Sign up for GitHub

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

Jump to bottom

cleanup(version): move master version to 0.0.0 instead of 1.2.0 #4579

Merged
merged 1 commit into from
Jul 27, 2021
Merged

cleanup(version): move master version to 0.0.0 instead of 1.2.0 #4579

merged 1 commit into from
Jul 27, 2021

Conversation

chefsale
Copy link
Contributor

@chefsale chefsale commented Jul 26, 2021 •
edited
Loading

Currently our master version is 1.2.0 and we do not update it due to using a trunk based release process.

I have looked into some options and the most sensible is this (https://softwareengineering.stackexchange.com/questions/333680/how-to-version-when-using-trunk-based-development).

Use 0.0.0 for master so it doesn't create confusion as we already include the build commit in the versioning.

Before:

sandi@sandi-ThinkPad-X1-Carbon-7th ~/w/n/nearcore (use-trunk) [2]> ./target/release/neard --version
neard 1.2.0 (build 12fd620c) (protocol 46) (db 26)

Now:

sandi@sandi-ThinkPad-X1-Carbon-7th ~/w/n/nearcore (use-trunk)> ./target/release/neard --version
neard (version trunk) (build 5ba32a5f-modified) (protocol 46) (db 26)

@chefsale chefsale added C-enhancement Category: An issue proposing an enhancement or a PR with one. S-automerge T-SRE Team: issues relevant to the SRE team labels Jul 26, 2021
@chefsale chefsale force-pushed the use-trunk branch 2 times, most recently from f68e41c to 5ba32a5 Compare July 26, 2021 23:10
mina86
mina86 approved these changes Jul 26, 2021
View reviewed changes
Copy link
Contributor

@mina86 mina86 left a comment

Choose a reason for hiding this comment

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

LGTM

@mina86
Copy link
Contributor

mina86 commented Jul 27, 2021

Our tags branch off master so git describe --tags sadly doesn’t work. Other than updating the version on each release to be something like 1.20.0-git setting it to zero seems like the best option.

chefsale added a commit to near/near-api-js that referenced this pull request Jul 27, 2021
@chefsale
bug(test): remove old versioning which is unused in nearcore nodes
676c763 
As a reference it is blocking: near/nearcore#4579
chefsale added a commit to near/near-api-js that referenced this pull request Jul 27, 2021
@chefsale
bug(test): remove old versioning which is unused in nearcore nodes
c7f6887 
As a reference it is blocking: near/nearcore#4579
due to: https://buildkite.com/nearprotocol/nearcore/builds/2580
@chefsale chefsale mentioned this pull request Jul 27, 2021
Merged
chefsale added a commit to near/near-api-js that referenced this pull request Jul 27, 2021
@chefsale
bug(test): remove old versioning which is unused in nearcore nodes
6c09898 
As a reference it is blocking: near/nearcore#4579
due to: https://buildkite.com/nearprotocol/nearcore/builds/2580
chefsale added a commit to near/near-api-js that referenced this pull request Jul 27, 2021
@chefsale
bug(test): remove old versioning which is unused in nearcore nodes
f003572 
As a reference it is blocking: near/nearcore#4579
due to: https://buildkite.com/nearprotocol/nearcore/builds/2580
chefsale added a commit to near/near-api-js that referenced this pull request Jul 27, 2021
@chefsale
bug(test): remove old versioning which is unused in nearcore nodes
673a104 
As a reference it is blocking: near/nearcore#4579
due to: https://buildkite.com/nearprotocol/nearcore/builds/2580
chefsale added a commit to near/near-api-js that referenced this pull request Jul 27, 2021
@chefsale
bug(test): remove old versioning which is unused in nearcore nodes
26b3dd2 
As a reference it is blocking: near/nearcore#4579
due to: https://buildkite.com/nearprotocol/nearcore/builds/2580
@chefsale chefsale force-pushed the use-trunk branch 2 times, most recently from 1b7f72e to e44a85b Compare July 27, 2021 02:48
@chefsale
Copy link
Contributor Author

chefsale commented Jul 27, 2021 •
edited
Loading

Changed also to print (release trunk) or (release X.X.X) instead of X.X.X only.

@chefsale
cleanup(version): move master version to 0.0.0 instead of 1.2.0
08e1243 
Currently our master version is 1.2.0 and we do not update it due to using a trunk based release process.

I have looked into some options and the most sensible is this (https://softwareengineering.stackexchange.com/questions/333680/how-to-version-when-using-trunk-based-development).

Use 0.0.0 for master so it doesn't create confusion as we already include the build commit in the versioning.

Before:
```
sandi@sandi-ThinkPad-X1-Carbon-7th ~/w/n/nearcore (use-trunk) [2]> ./target/release/neard --version
neard 1.2.0 (build 12fd620) (protocol 46) (db 26)
```

Now:
```
sandi@sandi-ThinkPad-X1-Carbon-7th ~/w/n/nearcore (use-trunk)> ./target/release/neard --version
neard (version trunk) (build 5ba32a5-modified) (protocol 46) (db 26)
```
@near-bulldozer near-bulldozer bot merged commit 587db1d into master Jul 27, 2021
@near-bulldozer near-bulldozer bot deleted the use-trunk branch July 27, 2021 12:37
miraclx added a commit that referenced this pull request Nov 3, 2021
@miraclx
{integration,jsonrpc}-tests: drop version, match workspace
99bdfae 
follow-up to #4579
pmnoxx pushed a commit that referenced this pull request Nov 20, 2021
@miraclx @pmnoxx
{integration,jsonrpc}-tests: drop version, match workspace
2af4a06 
follow-up to #4579
@miraclx miraclx mentioned this pull request Jan 26, 2022
Merged
near-bulldozer bot pushed a commit that referenced this pull request Feb 1, 2022
@miraclx
feat(themis): whitelist neard from unversioned checks (#6202)
88e5bf7 
Fixes #6197

Relax `themis` unversioned checks for the `neard` binary, as its version is expected to deviate from other crates in the workspace.

However, I'm keeping `neard` binary on master unversioned to stay compliant with #4579
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@frol frol frol approved these changes

@mina86 mina86 mina86 approved these changes

@matklad matklad Awaiting requested review from matklad

@mhalambek mhalambek Awaiting requested review from mhalambek

@bowenwang1996 bowenwang1996 Awaiting requested review from bowenwang1996

Assignees
No one assigned
Labels
C-enhancement Category: An issue proposing an enhancement or a PR with one. T-SRE Team: issues relevant to the SRE team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@chefsale @mina86 @frol