Merge pull request #5688 from thaJeztah/23.0_backport_bump_xx

[23.0 backport] update xx to v1.6.1 for compatibility with alpine 3.21
update xx to v1.6.1 for compatibility with alpine 3.21
2026-08-24 18:14:17 -05:00 · 2024-12-18 10:25:21 +00:00 · 2024-12-13 01:11:12 +01:00 · 2024-12-13 01:10:48 +01:00 · 2024-12-13 01:10:20 +01:00 · 2024-12-13 01:09:32 +01:00
2 changed files with 3 additions and 2 deletions
@@ -45,7 +45,8 @@ jobs:
      fail-fast: false
      matrix:
        os:
-          - macos-12
+          - macos-13  # macOS 13 on Intel
+          - macos-14  # macOS 14 on arm64 (Apple Silicon M1)
 #          - windows-2022 # FIXME: some tests are failing on the Windows runner, as well as on Appveyor since June 24, 2018: https://ci.appveyor.com/project/docker/cli/history
    steps:
      -
@@ -3,7 +3,7 @@
 ARG BASE_VARIANT=alpine
 ARG GO_VERSION=1.22.6
 ARG ALPINE_VERSION=3.20
-ARG XX_VERSION=1.1.1
+ARG XX_VERSION=1.6.1
 ARG GOVERSIONINFO_VERSION=v1.3.0
 ARG GOTESTSUM_VERSION=v1.10.0
 ARG BUILDX_VERSION=0.11.2
Author	SHA1	Message	Date
Paweł GronowskiandGitHub	c32057333e	Merge pull request #5688 from thaJeztah/23.0_backport_bump_xx [23.0 backport] update xx to v1.6.1 for compatibility with alpine 3.21	2024-12-18 10:25:21 +00:00
Sebastiaan van Stijn	a7abd65c2c	update xx to v1.6.1 for compatibility with alpine 3.21 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: https://github.com/tonistiigi/xx/compare/v1.5.0...v1.6.1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit `1e51ae7af2`) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-13 01:11:12 +01:00
Sebastiaan van Stijn	3d49d403c7	Dockerfile: update xx to v1.5.0 full diff: https://github.com/tonistiigi/xx/compare/v1.4.0...v1.5.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit `1e6cbbc3f1`) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-13 01:10:48 +01:00
CrazyMaxandSebastiaan van Stijn	9a594cbe33	Dockerfile: update to xx 1.4.0 Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com> (cherry picked from commit `adb018084c`) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-13 01:10:20 +01:00
CrazyMaxandSebastiaan van Stijn	dd25cd2d2b	Dockerfile: update to xx 1.2.1 Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com> (cherry picked from commit `fca67dd817`) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-13 01:09:32 +01:00
Sebastiaan van StijnandGitHub	6ff84b8076	Merge pull request #5678 from austinvazquez/cherry-pick-9617e8d0ce8ef7d38bd2291eb7ba0da1a05fabc5-to-23.0 [23.0] gha: update to macOS 13, add macOS 14 arm64 (Apple Silicon M1)	2024-12-07 10:17:19 +01:00
Sebastiaan van StijnandAustin Vazquez	09b43d5ed9	gha: update to macOS 13, add macOS 14 arm64 (Apple Silicon M1) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit `9617e8d0ce`) Signed-off-by: Austin Vazquez <macedonv@amazon.com>	2024-12-07 00:18:18 -07:00