From da0658a531e666d7e26ee89cdd5a1751b5c16b96 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@thegeeklab.de>
Date: Mon, 13 May 2024 15:27:17 +0200
Subject: [PATCH] Pin golang container to minor release (#3696)

---
 .gitpod.yml               | 2 +-
 .woodpecker/binaries.yaml | 6 ++----
 .woodpecker/docker.yaml   | 7 ++-----
 .woodpecker/docs.yaml     | 2 +-
 .woodpecker/test.yaml     | 2 +-
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index f5615449f..e1a42ef1d 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -9,7 +9,7 @@ tasks:
       WOODPECKER_DEV_WWW_PROXY: http://localhost:8010
       WOODPECKER_BACKEND_DOCKER_NETWORK: ci_default
     init: |
-      GO_VERSION=1.21.5
+      GO_VERSION=1.22
       rm -rf ~/go
       curl -fsSL https://dl.google.com/go/go$GO_VERSION.linux-amd64.tar.gz | tar xzs -C ~/
       go mod tidy
diff --git a/.woodpecker/binaries.yaml b/.woodpecker/binaries.yaml
index d72d0034d..d4bcb5c5e 100644
--- a/.woodpecker/binaries.yaml
+++ b/.woodpecker/binaries.yaml
@@ -2,10 +2,9 @@ when:
   event: tag
 
 variables:
-  - &golang_image 'docker.io/golang:1.22.2'
+  - &golang_image 'docker.io/golang:1.22'
   - &node_image 'docker.io/node:22-alpine'
-  - &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.2'
-  - &xgo_version 'go-1.21.2'
+  - &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.x'
 
 steps:
   build-web:
@@ -34,7 +33,6 @@ steps:
     environment:
       PLATFORMS: linux|arm64/v8;linux|amd64;windows|amd64
       TAGS: bindata sqlite sqlite_unlock_notify netgo
-      XGO_VERSION: *xgo_version
       TARGZ: '1'
 
   build-tarball:
diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml
index 3291b08e1..b28e5d870 100644
--- a/.woodpecker/docker.yaml
+++ b/.woodpecker/docker.yaml
@@ -1,8 +1,7 @@
 variables:
-  - &golang_image 'docker.io/golang:1.22.2'
+  - &golang_image 'docker.io/golang:1.22'
   - &node_image 'docker.io/node:22-alpine'
-  - &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.2'
-  - &xgo_version 'go-1.21.2'
+  - &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.x'
   - &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:3.2.1'
   - &platforms_release 'linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/386,linux/amd64,linux/ppc64le,linux/riscv64,linux/s390x,freebsd/arm64,freebsd/amd64,openbsd/arm64,openbsd/amd64'
   - &platforms_server 'linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le,linux/riscv64'
@@ -98,7 +97,6 @@ steps:
     environment:
       PLATFORMS: linux|amd64
       TAGS: bindata sqlite sqlite_unlock_notify netgo
-      XGO_VERSION: *xgo_version
     when:
       - event: pull_request
         evaluate: 'CI_COMMIT_PULL_REQUEST_LABELS contains "build_pr_images"'
@@ -121,7 +119,6 @@ steps:
     environment:
       PLATFORMS: linux|arm/v7;linux|arm64/v8;linux|amd64;linux|ppc64le;linux|riscv64
       TAGS: bindata sqlite sqlite_unlock_notify netgo
-      XGO_VERSION: *xgo_version
     when:
       branch:
         - ${CI_REPO_DEFAULT_BRANCH}
diff --git a/.woodpecker/docs.yaml b/.woodpecker/docs.yaml
index 6a1095f64..bc59052d6 100644
--- a/.woodpecker/docs.yaml
+++ b/.woodpecker/docs.yaml
@@ -1,5 +1,5 @@
 variables:
-  - &golang_image 'docker.io/golang:1.21.5'
+  - &golang_image 'docker.io/golang:1.22'
   - &node_image 'docker.io/node:21-alpine'
   - &alpine_image 'docker.io/alpine:3.19'
   - path: &when_path
diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml
index 8c5e2b0cd..a21dd6baf 100644
--- a/.woodpecker/test.yaml
+++ b/.woodpecker/test.yaml
@@ -1,5 +1,5 @@
 variables:
-  - &golang_image 'docker.io/golang:1.21.5'
+  - &golang_image 'docker.io/golang:1.22'
   - &when
     - path: &when_path # related config files
         - '.woodpecker/test.yaml'