From b51d40b22ea92917cf82eb1935f2e30eea034599 Mon Sep 17 00:00:00 2001
From: Fabio1988 <fabio.schett@gmail.com>
Date: Sun, 5 May 2024 21:41:26 +0200
Subject: [PATCH] Go 1.21.6 1.21.7 1.21.8 1.22.0 1.22.1

---
 .github/workflows/image.yml    | 22 +++++++---------------
 .github/workflows/test.yml     |  4 ++--
 Dockerfile                     | 13 ++++++++++---
 rootfs/usr/local/bin/xgo-build |  2 +-
 tests/c/go.mod                 |  3 +++
 tests/cpp/go.mod               |  3 +++
 6 files changed, 26 insertions(+), 21 deletions(-)
 create mode 100644 tests/c/go.mod
 create mode 100644 tests/cpp/go.mod

diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 3161ad3..6531e2b 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -22,8 +22,8 @@ env:
   DOCKERHUB_SLUG: crazymax/xgo
   GHCR_SLUG: ghcr.io/crazy-max/xgo
   PLATFORMS: linux/amd64,linux/arm64
-  LATEST_CURRENT: 1.21.5
-  LATEST_PREVIOUS: 1.20.12
+  LATEST_CURRENT: 1.22.1
+  LATEST_PREVIOUS: 1.21.8
 
 jobs:
   prepare:
@@ -58,25 +58,17 @@ jobs:
       fail-fast: false
       matrix:
         go_version:
-          - 1.20.0
-          - 1.20.1
-          - 1.20.2
-          - 1.20.3
-          - 1.20.4
-          - 1.20.5
-          - 1.20.6
-          - 1.20.7
-          - 1.20.8
-          - 1.20.9
-          - 1.20.10
-          - 1.20.11
-          - 1.20.12
           - 1.21.0
           - 1.21.1
           - 1.21.2
           - 1.21.3
           - 1.21.4
           - 1.21.5
+          - 1.21.6
+          - 1.21.7
+          - 1.21.8
+          - 1.22.0
+          - 1.22.1
     steps:
       -
         name: Checkout
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4d26294..fe99a22 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,8 +24,8 @@ jobs:
       fail-fast: false
       matrix:
         go_version:
-          - 1.21.5
-          - 1.20.12
+          - 1.22.1
+          - 1.21.8
         case:
           - c
           - cpp
diff --git a/Dockerfile b/Dockerfile
index 3c61f14..65cd9a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,24 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION="1.21.5"
+ARG GO_VERSION="1.22.1"
 ARG OSXCROSS_VERSION="11.3"
+ARG GHQ_VERSION="1.6.1"
 ARG XX_VERSION="1.3.0"
-ARG ALPINE_VERSION="3.18"
+ARG ALPINE_VERSION="3.19"
 ARG PLATFORMS="linux/386 linux/amd64 linux/arm64 linux/arm/v5 linux/arm/v6 linux/arm/v7 linux/mips linux/mipsle linux/mips64 linux/mips64le linux/ppc64le linux/riscv64 linux/s390x windows/386 windows/amd64"
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
-FROM --platform=$BUILDPLATFORM golang:1.20-alpine${ALPINE_VERSION} AS base
+FROM --platform=$BUILDPLATFORM golang:1.22-alpine${ALPINE_VERSION} AS base
 COPY --from=xx / /
 ENV CGO_ENABLED=0
 RUN apk add --no-cache file git
 WORKDIR /src
 
+FROM base AS ghq
+ARG GHQ_VERSION
+RUN --mount=type=cache,target=/go/pkg/mod \
+  go install github.com/x-motemen/ghq@v${GHQ_VERSION}
+
 FROM base AS version
 RUN --mount=target=. \
   echo $(git describe --match 'v[0-9]*' --dirty='.m' --always --tags) | tee /tmp/.version
@@ -100,6 +106,7 @@ EOT
 FROM crazymax/osxcross:${OSXCROSS_VERSION} AS osxcross
 FROM goxx-base
 COPY --from=build /usr/bin/xgo /usr/local/bin/xgo
+COPY --from=ghq /go/bin/ghq /usr/local/bin/ghq
 COPY --from=osxcross /osxcross /osxcross
 
 ENV XGO_IN_XGO="1"
diff --git a/rootfs/usr/local/bin/xgo-build b/rootfs/usr/local/bin/xgo-build
index 1780139..50de89f 100755
--- a/rootfs/usr/local/bin/xgo-build
+++ b/rootfs/usr/local/bin/xgo-build
@@ -99,7 +99,7 @@ else
 
   # Otherwise download the canonical import path (may fail, don't allow failures beyond)
   echo "Fetching main repository $1..."
-  GO111MODULE=off go get -v -d "$1"
+  GHQ_ROOT=$GOPATH_ROOT ghq get "$1"
   set -e
 
   cd "$GOPATH_ROOT/$1"
diff --git a/tests/c/go.mod b/tests/c/go.mod
new file mode 100644
index 0000000..a26af69
--- /dev/null
+++ b/tests/c/go.mod
@@ -0,0 +1,3 @@
+module tests/c
+
+go 1.22
diff --git a/tests/cpp/go.mod b/tests/cpp/go.mod
new file mode 100644
index 0000000..c035b3a
--- /dev/null
+++ b/tests/cpp/go.mod
@@ -0,0 +1,3 @@
+module tests/cpp
+
+go 1.22