Add cargo-vendor-filterer in devel version and drop it from CI #754
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #754 +/- ##
==========================================
- Coverage 83.43% 83.11% -0.33%
==========================================
Files 83 96 +13
Lines 8689 9646 +957
Branches 74 74
==========================================
+ Hits 7250 8017 +767
- Misses 1111 1244 +133
- Partials 328 385 +57 ☔ View full report in Codecov by Sentry. |
|
Ok, it will be fixed by https://code.launchpad.net/~juliank/ubuntu/+source/dh-cargo/+git/dh-cargo/+merge/480016 We may not need the ci / |
Ubuntu devel already contains rust-cargo-vendor-filterer, we can't yet build-depend on it in debian/control, but for now we should install it as build-dependency.
It's not used by dh-cargo anymore
Ubuntu devel already contains rust-cargo-vendor-filterer, we can't yet build-depend on it in debian/control for everybody (as it's not in noble yet), but we can still workaround this. A change to dh-rust (just after the last run of the build-deb run on the PR), broke the usage of cargo-vendor-filterer when installed from cargo itself. This is ugly, but avoids us to branch for now.
If cargo-vendor-filter is used to generate the debian/control vendored sources it won't include the windows and other filtered crates. However the version that is in noble is not ready for this since it does not support filtering and then we'd just fail at configure phase, expecting the filtered crates to be there. As per this, in the cargo filterer missing case, just do manually what dh-cargo does without the vendoring checks
3v1n0
force-pushed
the
deb-ci-install-filterer-from-repos
branch
from
e484665 to
1d82b25
Compare
This is what dh-cargo expects in plucky, so let's track devel, while noble won't perform such check
3v1n0
force-pushed
the
deb-ci-install-filterer-from-repos
branch
from
1d82b25 to
db060a6
Compare
If cargo home is set we should not remove it during cleanup
|
@didrocks needed to add other changes as the For now I think ignoring the result of |
Ack, thanks on the rationale! Sounds good to me. |
#760) As per the plucky changes on dh-cargo we need to use a filtered `XS-Vendored-Sources-Rust` value in `debian/control`. The logic we had in the CI job that is in charge of updating such field become then incorrect. So, use the same logic that we have during debian package cleanup and support targeting different branches. For now we don't fully branch for noble but this allows to be prepared to that event (that is likely to have to happen soon). Fixed also an issue that lead to ignoring dh-cargo issues when running the script. It shares few commits with #754 UDENG-5865
Ubuntu devel already contains rust-cargo-vendor-filterer, we can't yet
build-depend on it in debian/control for everybody (as it's not in noble
yet), but we can still workaround this.
A change to dh-rust (just after the last run of the
build-deb run on the PR), broke the usage of cargo-vendor-filterer
when installed from cargo itself.
This is ugly, but avoids us to branch for now.
However... This still doesn't work for plucky because of this bug:https://bugs.launchpad.net/ubuntu/+source/dh-cargo/+bug/2096268UDENG-5865