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

Update main post-0.1 release #3546

Merged

Conversation

tnull
Copy link
Contributor

@tnull tnull commented Jan 16, 2025

Here, we cherry-pick the commits updating README and version numbers from the 0.1 branch, as it's otherwise a bit confusing to not have them up-to-date (especially since main acts effectively as the landing page of the repository).

@tnull tnull force-pushed the 2025-01-update-main-post-0.1-release branch from 25ff653 to c144d42 Compare January 16, 2025 08:40
@tnull tnull requested a review from TheBlueMatt January 16, 2025 08:40
@TheBlueMatt
Copy link
Collaborator

Can we make the version numbers, like, 0.0.1 or something so we don't have to change them until we branch? Alternatively, they should be 0.2-git or so.

@tnull
Copy link
Contributor Author

tnull commented Jan 16, 2025

so we don't have to change them until we branch

Not quite sure I'm following - why would we need to change them? Ah, do you mean so that we don't need to keep them in sync with the patch releases?

@TheBlueMatt
Copy link
Collaborator

Just so we don't have to update the version numbers on main after every release.

@tnull tnull force-pushed the 2025-01-update-main-post-0.1-release branch 2 times, most recently from beeed1e to c144d42 Compare January 17, 2025 10:01
@tnull
Copy link
Contributor Author

tnull commented Jan 17, 2025

Just so we don't have to update the version numbers on main after every release.

Well, we could also treat PRs updating the README and bumping version numbers just as any other PRs: first land them on main, then backport them to the specific branch?

Can we make the version numbers, like, 0.0.1 or something so we don't have to change them until we branch? Alternatively, they should be 0.2-git or so.

I kinda dislike the former as a 0.0.1 version is also confusing to anyone looking into the Cargo.tomls. I tried the latter, but it simply doesn't work:

error: failed to parse manifest at `/Users/erohrer/workspace/rust-lightning/lightning/Cargo.toml`

Caused by:
  unexpected character '-' after minor version number for key `package.version`

@TheBlueMatt
Copy link
Collaborator

Well, we could also treat PRs updating the README and bumping version numbers just as any other PRs: first land them on main, then backport them to the specific branch?

Not really - we might want to do an 0.1.2 and 0.2.1 at the same time and any such commits will just conflict and be more work than they're worth...

I kinda dislike the former as a 0.0.1 version is also confusing to anyone looking into the Cargo.tomls. I tried the latter, but it simply doesn't work:

Weird, the docs say explicitly you can do this... https://doc.rust-lang.org/cargo/reference/manifest.html#the-version-field Can we do 0.2git without the -?

@tnull
Copy link
Contributor Author

tnull commented Jan 20, 2025

Weird, the docs say explicitly you can do this... https://doc.rust-lang.org/cargo/reference/manifest.html#the-version-field

Note that it says 1.0.0-alpha.4, i.e., X.Y.Z-something.A.

Can we do 0.2git without the -?

Nope. 0.1.0-git would work, which is however also not great as it doesn't communicate the 0.1.* wildcard really. How about 0.1.0+git, as git seems more like metadata rather than an actual version here (and gets ignored by cargo)?

@tnull tnull force-pushed the 2025-01-update-main-post-0.1-release branch 2 times, most recently from 4b9b088 to ab81966 Compare January 20, 2025 09:09
@tnull
Copy link
Contributor Author

tnull commented Jan 20, 2025

How about 0.1.0+git, as git seems more like metadata rather than an actual version here (and gets ignored by cargo)?

Now included a fixup going this way.

Copy link

codecov bot commented Jan 20, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.92%. Comparing base (3fbf97d) to head (ab81966).
Report is 11 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3546      +/-   ##
==========================================
+ Coverage   88.42%   88.92%   +0.49%     
==========================================
  Files         149      149              
  Lines      113302   116639    +3337     
  Branches   113302   116639    +3337     
==========================================
+ Hits       100191   103725    +3534     
+ Misses      10636    10522     -114     
+ Partials     2475     2392      -83     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@TheBlueMatt
Copy link
Collaborator

How about 0.1.0+git, as git seems more like metadata rather than an actual version here (and gets ignored by cargo)?

I don't think git is "metadata" here - git HEAD is really "0.2 before alpha", rather than "0.1 plus git". Really its neither and its "some code that might end up in 0.2, or maybe some stuff that's in 0.2 and is targeting 0.3" but cargo won't let us call the version just "git" :/.

@tnull
Copy link
Contributor Author

tnull commented Jan 20, 2025

I don't think git is "metadata" here - git HEAD is really "0.2 before alpha", rather than "0.1 plus git". Really its neither and its "some code that might end up in 0.2, or maybe some stuff that's in 0.2 and is targeting 0.3" but cargo won't let us call the version just "git" :/.

Hmm, I kind of see your point. What's your suggestion then? IMO, any variant of 0.1.0 would be better than leaving it 0.0.124 forever or 0.0.1?

We could also bump the MSRV to 1.75 for the whole workspace, as, IIUC, it would allow us to drop the version field entirely 😜 (I'm starting to look forward to the next Debian release again)

@TheBlueMatt
Copy link
Collaborator

Hmm, I kind of see your point. What's your suggestion then? IMO, any variant of 0.1.0 would be better than leaving it 0.0.124 forever or 0.0.1?

I guess if we have to have a version my preference would be 0.2+git or 0.2-prealpha1

We could also bump the MSRV to 1.75 for the whole workspace, as, IIUC, it would allow us to drop the version field entirely 😜 (I'm starting to look forward to the next Debian release again)

Ha, that would be nice.

@tnull tnull force-pushed the 2025-01-update-main-post-0.1-release branch from ab81966 to dc8160d Compare January 22, 2025 11:45
@tnull
Copy link
Contributor Author

tnull commented Jan 22, 2025

I guess if we have to have a version my preference would be 0.2+git or 0.2-prealpha1

Alright, now updated all to use the next, not the current version with the +git metadata, e.g. 0.2.0+git.

@tnull tnull force-pushed the 2025-01-update-main-post-0.1-release branch from dc8160d to bab4abb Compare January 22, 2025 11:53
tnull added a commit to tnull/ldk-node that referenced this pull request Jan 25, 2025
We bump the version number on `main` to the next-planned minor release
(mod `+git` metadata tag). This aligns what we're planning to do in LDK
(see lightningdevkit/rust-lightning#3546) and
allows us to run SemVer checks on PRs towards `main`.
@TheBlueMatt
Copy link
Collaborator

LGTM, feel free to squash.

@tnull tnull force-pushed the 2025-01-update-main-post-0.1-release branch from bab4abb to a116495 Compare January 28, 2025 08:54
@tnull
Copy link
Contributor Author

tnull commented Jan 28, 2025

LGTM, feel free to squash.

Squashed fixups without further changes.

@tnull tnull force-pushed the 2025-01-update-main-post-0.1-release branch from a116495 to 3c55cf7 Compare January 28, 2025 14:41
TheBlueMatt and others added 3 commits January 28, 2025 16:45
Sadly, dns-resolver got uploaded as 0.1.0 without a -beta1 tag (and
yanked), and thus we release it here as 0.2.0.
.. we planned to use the BP for some more advanced integration tests, but we
haven't actually implemented them as of now. Here we drop the
unnecessary dev-dependency for now.
@tnull tnull force-pushed the 2025-01-update-main-post-0.1-release branch from 3c55cf7 to f19016f Compare January 28, 2025 15:45
@tnull
Copy link
Contributor Author

tnull commented Jan 28, 2025

Rebased on current main, as I had to rebase #3509 on top of this.

Copy link
Collaborator

@TheBlueMatt TheBlueMatt left a comment

Choose a reason for hiding this comment

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

Sure.

@TheBlueMatt TheBlueMatt merged commit 97e70b4 into lightningdevkit:main Jan 28, 2025
25 checks passed
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.

2 participants