Skip to content

[25.0 backport] update xx to v1.6.1 for compatibility with alpine 3.21#5687

Merged
vvoland merged 3 commits intodocker:25.0from
thaJeztah:25.0_backport_bump_xx
Dec 18, 2024
Merged

[25.0 backport] update xx to v1.6.1 for compatibility with alpine 3.21#5687
vvoland merged 3 commits intodocker:25.0from
thaJeztah:25.0_backport_bump_xx

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

crazy-max and others added 3 commits December 13, 2024 01:05
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit adb0180)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: tonistiigi/xx@v1.4.0...v1.5.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 1e6cbbc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This fixes compatibility with alpine 3.21

- Fix additional possible `xx-cc`/`xx-cargo` compatibility issue with Alpine 3.21
- Support for Alpine 3.21
- Fix `xx-verify` with `file` 5.46+
- Fix possible error taking lock in `xx-apk` in latest Alpine without `coreutils`

full diff: tonistiigi/xx@v1.5.0...v1.6.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 1e51ae7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Dec 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 58.44%. Comparing base (190ebb5) to head (cdbfdc6).
Report is 5 commits behind head on 25.0.

Additional details and impacted files
@@           Coverage Diff           @@
##             25.0    #5687   +/-   ##
=======================================
  Coverage   58.44%   58.44%           
=======================================
  Files         329      329           
  Lines       27217    27217           
=======================================
  Hits        15907    15907           
  Misses      10384    10384           
  Partials      926      926           

Copy link
Copy Markdown
Member

@laurazard laurazard left a comment

Choose a reason for hiding this comment

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

LGTM

@vvoland vvoland merged commit 43987fc into docker:25.0 Dec 18, 2024
@thaJeztah thaJeztah deleted the 25.0_backport_bump_xx branch December 18, 2024 10:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants