Skip to content
Snippets Groups Projects
Commit d4b413a6 authored by Dylan Aïssi's avatar Dylan Aïssi
Browse files

ci-buildpackage: drop the use of wrap-and-sort

This was a workaround for odd nodes packages that
apt was not able to parse. See
infrastructure/apertis-docker-images@e954d2be

This is no longer required since it was fixed in apt:
https://salsa.debian.org/apt-team/apt/-/merge_requests/167



Having this workaround leads to other apt failures
to resolve dependencies (because of conflicts between
rustc and rustc-web).

Signed-off-by: default avatarDylan Aïssi <dylan.aissi@collabora.com>
parent 1e68d5c4
No related branches found
No related tags found
2 merge requests!102Backport v2025 <- v2026dev1: Release apertis-dev-tools version 0.2024.18,!100ci-buildpackage: drop the use of wrap-and-sort
......@@ -11,17 +11,11 @@ set -ex
export DEBIAN_FRONTEND=noninteractive
# Works around node-* packages having Build-Depends apt can't parse
wrap-and-sort -f debian/control
apt-get -qy update
apt-get -qy -o APT::Get::Build-Dep-Automatic=yes \
-o Acquire::http::Pipeline-Depth=0 \
build-dep "$(pwd)"
# Revert changes made by `wrap-and-sort`
git checkout debian/
dpkg-checkbuilddeps
dversion="$(dpkg-parsechangelog -S Version)"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment