search

waycrate / swhkd

Sxhkd clone for Wayland (works on TTY and X11 too)
https://git.sr.ht/~shinyzenith/swhkd
BSD 2-Clause "Simplified" License
679 stars 47 forks source link

Cargo.lock is out of date in the repository #178

Open oneingan opened 1 year ago

oneingan commented 1 year ago

Cargo.lock is out of date in the repository

...
[[package]]
name = "Simple-Wayland-HotKey-Daemon"
version = "1.2.0"
dependencies = [
 "clap",
 "env_logger",
...
[[package]]
name = "swhks"
version = "1.2.0"
dependencies = [
 "env_logger",
...

must be version="1.2.1" for tagged release 1.2.1

also version="1.2.1" in master must be version="1.3.0-dev" or similar.

Shinyzenith commented 1 year ago

Hi, my apologies for this issue. @ajanon I currently don't have access to my laptop, I'm sorry for the inconvenience but would you mind updating the lock file and tagging a release?

ajanon commented 1 year ago

On it! Some small clarification for the release: do you want me to only change the Cargo.lock file as suggested (i.e., change the version to 1.3.0-dev), or do you want me to make an actual 1.3.0-dev binary release and tag the git repo accordingly?

Shinyzenith commented 1 year ago

On it! Some small clarification for the release: do you want me to only change the Cargo.lock file as suggested (i.e., change the version to 1.3.0-dev), or do you want me to make an actual 1.3.0-dev binary release and tag the git repo accordingly?

Hm should we tag 1.3.2 release with a fixed Cargo.lock (Minor bump as you and eden have introduced a lot of new and amazing features!) or go ahead with 1.3.2-dev ?

ajanon commented 1 year ago

I feel the new features are a bit unstable for now (given the number of new issues!), so I am not 100% confident we should go ahead with a release.

ajanon commented 1 year ago

Wait, looking closely at this, Cargo.lock is up-to-date on the main branch: https://github.com/waycrate/swhkd/blob/a315c78f521933a9d23e8e6a7a9fb2d207207f1c/Cargo.lock#L5-L21

https://github.com/waycrate/swhkd/blob/a315c78f521933a9d23e8e6a7a9fb2d207207f1c/Cargo.lock#L538-L547

We should definitely discuss how to manage versions and releases for sure, but I don't think Cargo.lock needs to be updated at this point.

@uningan could you clarify what you mean for Cargo.lock?

oneingan commented 1 year ago

Sure, in tagged release 1.2.1 Cargo.lock is 1.2.0 while swhkd/Cargo.toml declares 1.2.1. This provokes Cargo.lock being rebuild during built process. Then sandboxed build (as in nixpkgs) fails.

I propose to make a bug fix release 1.2.2 with updated and synced Cargo.lock versions.

Of course, in main branch versions are updated and synced and forced rebuilt doesn't happen, only that 1.3.0-dev or similar looks better.

ajanon commented 1 year ago

Makes sense, thanks for the explanation! I think it would be nice to make a small release with some fixes. How about branching at fdf5e10? This is just before the new mode feature from eden and the events re-emission (both of which I'd like to test a bit more). This would include a bunch of fixes (which we'd probably need to list for the release text).

@Shinyzenith what do you think?

Shinyzenith commented 1 year ago

Yep I think this is the best course of action! Go ahead and tag the release!

ajanon commented 1 year ago

We should be able to close this issue if we merge #186 and #187.

ajanon commented 1 year ago

I'm just waiting to have a complete changelog before merging #186 so that we can do a release right away afterward.