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

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

Open
oneingan opened this issue Dec 14, 2022 · 10 comments
Open

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

oneingan opened this issue Dec 14, 2022 · 10 comments
Assignees
Labels
Bug Something isn't working Difficulty: low Priority: high High priority tasks

Comments

@oneingan
Copy link

oneingan commented Dec 14, 2022

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.

@oneingan oneingan added the Bug Something isn't working label Dec 14, 2022
@Shinyzenith
Copy link
Member

Shinyzenith commented Dec 16, 2022

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
Copy link
Collaborator

ajanon commented Dec 17, 2022

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
Copy link
Member

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
Copy link
Collaborator

ajanon commented Dec 17, 2022

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
Copy link
Collaborator

ajanon commented Dec 17, 2022

Wait, looking closely at this, Cargo.lock is up-to-date on the main branch:

swhkd/Cargo.lock

Lines 5 to 21 in a315c78

[[package]]
name = "Simple-Wayland-HotKey-Daemon"
version = "1.2.1"
dependencies = [
"clap",
"env_logger",
"evdev",
"flate2",
"itertools",
"log",
"nix",
"signal-hook",
"signal-hook-tokio",
"sysinfo",
"tokio",
"tokio-stream",
]

swhkd/Cargo.lock

Lines 538 to 547 in a315c78

[[package]]
name = "swhks"
version = "1.2.1"
dependencies = [
"clap",
"env_logger",
"log",
"nix",
"sysinfo",
]

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
Copy link
Author

oneingan commented Dec 17, 2022

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
Copy link
Collaborator

ajanon commented Dec 18, 2022

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
Copy link
Member

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

@ajanon
Copy link
Collaborator

ajanon commented Dec 20, 2022

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

@ajanon
Copy link
Collaborator

ajanon commented Dec 23, 2022

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something isn't working Difficulty: low Priority: high High priority tasks
Development

No branches or pull requests

5 participants