Skip to content

Conversation

@UdjinM6
Copy link

@UdjinM6 UdjinM6 commented Apr 28, 2022

#4768 follow-up

I believe it's better to do it this way cause it makes CLIENT_VERSION comparable again (4768 bumped it +1000000 while normally major versions bump it +10000).

MarcoFalke and others added 2 commits April 28, 2022 13:47
8f7b930 Drop the leading 0 from the version number (Andrew Chow)

Pull request description:

  Removes the leading 0 from the version number. The minor version, which we had been using as the major version, is now the major version. The revision, which we had been using as the minor version, is now the minor version. The revision number is dropped. The build number is promoted to being part of the version number. This also avoids issues where it was accidentally not included in the version number.

  The CLIENT_VERSION remains the same format as previous as previously, as the Major version was 0 so it never actually got included in it.

  The user agent string formatter is updated to follow this new versioning.

  ***

  Honestly I'm just tired of all of the people asking for "1.0" that maybe this'll shut them up. Skip the whole 1.0 thing and go straight to version 22.0!

  Also, this means that the terminology we commonly use lines up with how the variables are named. So major versions are actually bumping the major version number, etc.

ACKs for top commit:
  jnewbery:
    Code review ACK 8f7b930
  MarcoFalke:
    review ACK 8f7b930 🎻

Tree-SHA512: b5c3fae14d4c0a9c0ab3b1db7c949ecc0ac3537646306b13d98dd0efc17c489cdd16d43f0a24aaa28e9c4a92ea360500e05480a335b03f9fb308010cdd93a436
68c2ef1 Fix version string in Windows and Mac installers (Andrew Chow)

Pull request description:

  Apparently NSIS requires a 4 digit version number, and bitcoin#20223 dropped the 4th digit. So this adds a 4th 0 digit so that building the Windows installer doesn't fail. Also fixes a typo in that version string that was also present in a plist file.

ACKs for top commit:
  fanquake:
    ACK 68c2ef1
  laanwj:
    Code review ACK 68c2ef1
  hebasto:
    Approach ACK 68c2ef1, tested on Linux Mint 20 (x86_64, nsis 3.05-2).

Tree-SHA512: 845560ff176eae8081096426790c928a773fa75d366f42a2a4631c1be2ae9234d7a5b72854ccfaa7fa1a32002b937ca393b12168ffacf9a5e3e311a76725483a
@UdjinM6 UdjinM6 added this to the 18 milestone Apr 28, 2022
Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

utACK for merging via merge commit

@UdjinM6 UdjinM6 merged commit b22d589 into dashpay:develop Apr 28, 2022
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request May 18, 2022
build: switch to classical `major.minor.patch` semver
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