Upgrade npins#1589
Conversation
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Plus Run ID: ⛔ Files ignored due to path filters (1)
📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
📝 WalkthroughWalkthroughAdds a dedicated URL source handler (mkUrlSource) for Url/MutableUrl, adds optional arch passthrough to container pulls, updates the sources.json format version to 8, refreshes several pinned sources, and bumps the workspace uuid dependency. Changesnpins Source Handling and Version Updates
Estimated code review effort3 (Moderate) | ~20 minutes 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. Comment |
There was a problem hiding this comment.
Pull request overview
This PR updates the repository’s npins metadata to the newer sources.json format so npins update no longer fails with “Version 7 is too old”, and regenerates the corresponding Nix loader to match the new schema.
Changes:
- Upgrade
npins/sources.jsonfrom format version 7 to 8. - Regenerate
npins/default.nixto match npins v8 schema changes (notably handlingUrl/MutableUrland updated container fetching args). - Update several pinned inputs (e.g.,
frr,nixpkgs,rust-overlay) as part of the regeneratedsources.json.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| npins/sources.json | Bumps format version to v8 and updates multiple pin revisions/URLs/hashes. |
| npins/default.nix | Regenerated npins loader to support v8 sources schema and updated fetcher dispatch. |
|
yup, this is correct. That said, hold off on the merge for a few so I can bump the cargo packages with it. If we are going to take cache churn we may as well concentrate it to minimize CI load. Should only take a few minutes anyway. I'll just target a bump run against this branch. |
|
Ugh, looks like the cbindgen update breaks things |
(Claude) So basically there's a header we need to re-generate. |
|
@daniel-noland I opened githedgehog/dplane-rpc#33 in an attempt to solve this. This is probably not the right long-term solution though, but should unblock this particular PR (I think?). |
Yeah, we need to reorg the way that works because this is a problem waiting to happen. I'll approve for now but we should either abosorb that repo into dataplane / nix infra or at least stop committing the generated code because that is a pain. |
We had the following error for dependency updates:
$ bash scripts/bump.sh
++ dirname scripts/bump.sh
+ pushd scripts/..
/var/home/qmo/dev/dataplane /var/home/qmo/dev/dataplane
+ npins update
Error: Failed to deserialize sources.json
Caused by:
Version 7 is too old, you need to run upgrade
To address it, we simply ran the following command and committed the
changes:
$ npins upgrade
Signed-off-by: Quentin Monnet <qmo@qmon.net>
Manual run of "bash scripts/bump.sh" following the recent commit with "npins upgrade". Signed-off-by: Quentin Monnet <qmo@qmon.net>
87a098a to
aa6ecc2
Compare
|
Rebased without changes to the commits in the PR, I expect CI to pick the new version of the dplane-rpc branch and to pass |
[ Quentin: Re-run to catch dplane-rpc update ] Signed-off-by: github-actions[bot] <224724778+hedgehog-dataplane-update[bot]@users.noreply.github.com> Signed-off-by: Quentin Monnet <qmo@qmon.net>
name old req compatible latest new req ==== ======= ========== ====== ======= uuid 1.23.2 1.23.3 1.23.3 1.23.3 Signed-off-by: github-actions[bot] <224724778+hedgehog-dataplane-update[bot]@users.noreply.github.com>
aa6ecc2 to
6e7d774
Compare
|
In fact, I needed to re-run |
We had the following error for dependency updates:
To address it, we simply ran the following command and committed the changes:
$ npins upgrade@daniel-noland Can you please double-check this is OK?