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 dependencies + move to sqlx-oldapi for now #383

Merged
merged 6 commits into from
Jan 23, 2024
Merged

Conversation

icewind1991
Copy link
Member

sqlx 0.7 still has some issues which are blocking for us (launchbadge/sqlx#2975) so instead this moves to sqlx-oldapi for now which is a fork of 0.6 with some dependency updates.

Fixes #354

Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
@max-nextcloud
Copy link
Contributor

https://github.com/nextcloud/notify_push/actions/runs/7613758006/job/20734418222?pr=383 looks like rustc is too old:

cargo check $cargo_release -j "$NIX_BUILD_CORES" --message-format=$cargo_message_format
error: package `clap_lex v0.6.0` cannot be built because it requires rustc 1.70.0 or newer, while the currently active rustc version is 1.69.0
Either upgrade to rustc 1.70.0 or newer, or use
cargo update -p clap_lex@0.6.0 --precise ver
where `ver` is the latest version of `clap_lex` supporting rustc 1.69.0
[naersk] cargo returned with exit code 101, exiting

I was able to fix a similar failure by using nix 23.11 instead here: 8d47bc8

Signed-off-by: Robin Appelman <robin@icewind.nl>
Copy link
Contributor

@max-nextcloud max-nextcloud left a comment

Choose a reason for hiding this comment

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

That seems like a good approach to be able to update the dependencies fast. First pass over the code changes looks good as well. Did not test locally though.

src/config/nc.rs Outdated Show resolved Hide resolved
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
@max-nextcloud
Copy link
Contributor

@icewind1991 I ran the tests and clippy locally again and everything is green. So good to go from my side. Anything else needed?

Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 icewind1991 merged commit 345d72a into main Jan 23, 2024
58 of 62 checks passed
@delete-merged-branch delete-merged-branch bot deleted the sqlx-oldapi branch January 23, 2024 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cargo audit complains about security issue in dependency
2 participants