Skip to content

Niv update crane + rust-overlay and remove the incorrect app.include entry in the Cargo.toml#107

Merged
OpsBotPrime merged 5 commits intomasterfrom
bump-crane
Apr 30, 2026
Merged

Niv update crane + rust-overlay and remove the incorrect app.include entry in the Cargo.toml#107
OpsBotPrime merged 5 commits intomasterfrom
bump-crane

Conversation

@Qqwy
Copy link
Copy Markdown
Contributor

@Qqwy Qqwy commented Apr 29, 2026

This PR contains two changes that make opsqueue nicer to build in larger Nix setups:

  1. It removes the include entry under [app] in the Cargo.toml. Turns out I was using it wrong: with no entry it includes the files in the .gitignore (which is what we want), whereas if you write an include yourself they are not added on top of the 'normal' Rust files but instead you have to manually supply the exact full set of files you like.
  2. Bumps the versions of crane and the rust-overlay we use, to make sure that opsqueue still builds successfully with those newer versions (and we get the stability and efficiency improvements from the newer versions as well).
  3. Side improvement: Removal of the outdated .sqlx folder entries. As we use sqlite and always have a 'live' sqlite DB available as the opsqueue_example_schema.db, there is no need to run a separate sqlx prepare step for offline building. The sqlite DB can even be used inside sandboxes like the Nix sandbox.

This PR is a trimmed down version of #105. It intentionally does not include the extra packaging checks on CI that that PR contains. Rather, properly doing 'CD' by publishing a new version of opsqueue to crates.io and a new version of the Python client to Pypi would have my preference (though this is outside of the scope of this PR).

Qqwy added 3 commits April 29, 2026 00:16
We want to include exactly those files that the `.gitignore` allows us
to include.
@Qqwy Qqwy changed the title Niv update crane + rust-overlay Niv update crane + rust-overlay and remove the incorrect app.include entry in the Cargo.toml Apr 29, 2026
@Qqwy Qqwy requested review from ReinierMaas and isomorpheme and removed request for ReinierMaas April 29, 2026 19:27
Copy link
Copy Markdown
Contributor

@isomorpheme isomorpheme left a comment

Choose a reason for hiding this comment

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

Nice win in terms of lines removed :D

I agree that we don't need any extra checks here if we're relying on the default .gitignore behavior now.

@Qqwy
Copy link
Copy Markdown
Contributor Author

Qqwy commented Apr 30, 2026

@OpsBotPrime merge and tag

@OpsBotPrime
Copy link
Copy Markdown
Contributor

Rebased as fe37398, waiting for CI …

@OpsBotPrime
Copy link
Copy Markdown
Contributor

Stopping integration because the PR changed after approval.

@Qqwy
Copy link
Copy Markdown
Contributor Author

Qqwy commented Apr 30, 2026

@OpsBotPrime merge and tag

…`app.include` entry in the `Cargo.toml`

Approved-by: Qqwy
Priority: Normal
Auto-deploy: false
@OpsBotPrime
Copy link
Copy Markdown
Contributor

Rebased as 00f6b0a, waiting for CI …

@OpsBotPrime
Copy link
Copy Markdown
Contributor

CI job 🟡 started.

@OpsBotPrime
Copy link
Copy Markdown
Contributor

@Qqwy I tagged your PR with v51. Please wait for the build of 00f6b0a to pass and don't forget to deploy it!

@OpsBotPrime OpsBotPrime merged commit 00f6b0a into master Apr 30, 2026
6 of 7 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.

3 participants