Merge pull request #5687 from thaJeztah/25.0_backport_bump_xx

[25.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:17 +00:00 · 2024-12-13 01:06:21 +01:00 · 2024-12-13 01:05:57 +01:00 · 2024-12-13 01:05:33 +01:00 · 2024-12-08 17:40:33 +01:00
8 changed files with 11 additions and 10 deletions
@@ -57,7 +57,7 @@ jobs:
        name: Update Go
        uses: actions/setup-go@v5
        with:
-          go-version: 1.22.8
+          go-version: "1.22.10"
      -
        name: Initialize CodeQL
        uses: github/codeql-action/init@v3
@@ -54,7 +54,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:
      -
@@ -72,7 +73,7 @@ jobs:
        name: Set up Go
        uses: actions/setup-go@v5
        with:
-          go-version: 1.22.8
+          go-version: "1.22.10"
      -
        name: Test
        run: |
@@ -4,8 +4,8 @@ ARG BASE_VARIANT=alpine
 ARG ALPINE_VERSION=3.20
 ARG BASE_DEBIAN_DISTRO=bookworm

-ARG GO_VERSION=1.22.8
-ARG XX_VERSION=1.2.1
+ARG GO_VERSION=1.22.10
+ARG XX_VERSION=1.6.1
 ARG GOVERSIONINFO_VERSION=v1.3.0
 ARG GOTESTSUM_VERSION=v1.10.0
 ARG BUILDX_VERSION=0.12.1
@@ -1,5 +1,5 @@
 variable "GO_VERSION" {
-    default = "1.22.8"
+    default = "1.22.10"
 }
 variable "VERSION" {
    default = ""
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.22.8
+ARG GO_VERSION=1.22.10
 ARG ALPINE_VERSION=3.20

 ARG BUILDX_VERSION=0.12.1
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.22.8
+ARG GO_VERSION=1.22.10
 ARG ALPINE_VERSION=3.20
 ARG GOLANGCI_LINT_VERSION=v1.55.2

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.22.8
+ARG GO_VERSION=1.22.10
 ARG ALPINE_VERSION=3.20
 ARG MODOUTDATED_VERSION=v0.8.0

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.22.8
+ARG GO_VERSION=1.22.10

 FROM golang:${GO_VERSION}-alpine AS generated
 ENV GOTOOLCHAIN=local
Author	SHA1	Message	Date
Paweł GronowskiandGitHub	43987fca48	Merge pull request #5687 from thaJeztah/25.0_backport_bump_xx [25.0 backport] update xx to v1.6.1 for compatibility with alpine 3.21	2024-12-18 10:25:17 +00:00
Sebastiaan van Stijn	cdbfdc6025	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:06:21 +01:00
Sebastiaan van Stijn	4b0e7ba9db	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:05:57 +01:00
CrazyMaxandSebastiaan van Stijn	d661d0449f	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:05:33 +01:00
Sebastiaan van StijnandGitHub	57ec2c7d72	Merge pull request #5680 from austinvazquez/cherry-pick-3284a80b05ea0e25b33cfd8ed383ee105d18a5bd-to-25.0 [25.0] update to go1.22.10	2024-12-08 17:40:33 +01:00
Sebastiaan van StijnandAustin Vazquez	190ebb5036	update to go1.22.10 go1.22.10 (released 2024-12-03) includes fixes to the runtime and the syscall package. See the Go 1.22.10 milestone on our issue tracker for details. - https://github.com/golang/go/issues?q=milestone%3AGo1.22.10+label%3ACherryPickApproved - full diff: https://github.com/golang/go/compare/go1.22.9...go1.22.10 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit `3284a80b05`) Signed-off-by: Austin Vazquez <macedonv@amazon.com>	2024-12-07 09:26:18 -07:00
Sebastiaan van StijnandGitHub	ecccbb4e63	Merge pull request #5677 from austinvazquez/cherry-pick-9617e8d0ce8ef7d38bd2291eb7ba0da1a05fabc5-to-25.0 [25.0] gha: update to macOS 13, add macOS 14 arm64 (Apple Silicon M1)	2024-12-07 10:15:42 +01:00
Sebastiaan van StijnandAustin Vazquez	0a98cba34b	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-06 23:59:34 -07:00
Paweł GronowskiandGitHub	64a322d6e1	Merge pull request #5642 from austinvazquez/cherry-pick-35c87e326c4f5c39cfd7473473cc4a5c6647c366-25.0 [25.0 backport] update to go1.22.9	2024-11-22 11:04:59 +01:00
Paweł GronowskiandAustin Vazquez	8b446aa5d0	update to go1.22.9 - https://github.com/golang/go/issues?q=milestone%3AGo1.22.9+label%3ACherryPickApproved - full diff: https://github.com/golang/go/compare/go1.22.8...go1.22.9 go1.22.9 (released 2024-11-06) includes fixes to the linker. See the [Go 1.22.9 milestone](https://github.com/golang/go/issues?q=milestone%3AGo1.22.9+label%3ACherryPickApproved) for details. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit `35c87e326c`) Signed-off-by: Austin Vazquez <macedonv@amazon.com>	2024-11-22 01:23:36 +00:00