Skip to content
Snippets Groups Projects

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

Merged Dylan Aïssi requested to merge wip/daissi/wrap-and-sort into apertis/v2024

This reverts commit e954d2be.

This was a workaround for odd nodes packages that apt was not able to parse. It has been fixed in apt 2.3.10 (Debian/Bookworm & Apertis/v2024) with https://salsa.debian.org/apt-team/apt/-/merge_requests/167

This has been fixed in v2026dev1 and in v2025.

We did not face the conflicts between rustc and rustc-web in Apertis v2024 because we first built the source package with a fixed ci-buildpackage in v2026dev1, and when backporting the same version to v2024 ci-package-builder reuses the already built source package thus this issue this not triggered. But for downstreams which doesn't use v2025 or v2026dev1 then they have to build the source package using a docker image of v2024 and therefor this issue needs to be fixed as well.

Edited by Dylan Aïssi

Merge request reports

Pipeline #834846 passed

Pipeline passed for bdd351bd on wip/daissi/wrap-and-sort

Merged by Sjoerd SimonsSjoerd Simons 1 month ago (Feb 4, 2025 9:53am UTC)

Merge details

  • Changes merged into with bdd351bd.
  • Deleted the source branch.

Pipeline #918754 passed

Pipeline passed for bdd351bd on apertis/v2024

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
Please register or sign in to reply
Loading