fix(dockerfiles//cd/builders): bump golang version to v1.23.1 (#418)

Signed-off-by: wuhuizuo <[email protected]> Signed-off-by: wuhuizuo <[email protected]>
PingCAP-QE · Sep 18, 2024 · 4c05774 · 4c05774
1 parent 34b72ff
commit 4c05774
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 49 deletions.
diff --git a/.github/workflows/pull-cd-builder-images.yaml b/.github/workflows/pull-cd-builder-images.yaml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         module: [builder-go]
-        go-profile: [go-1.23, go-1.22, go-1.21, go-1.20, go-1.19]
+        go-profile: [go-1.23, go-1.22, go-1.21]
         builder-profile: [local-docker]
         platform: [linux/amd64, linux/arm64]
     steps:

diff --git a/.github/workflows/pull-verify-packages-config.yaml b/.github/workflows/pull-verify-packages-config.yaml
@@ -13,17 +13,13 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.23"
 
       - name: Install tools
         run: |
           # install gomplate
-          git clone https://github.com/hairyhenderson/gomplate && \
-            pushd gomplate && \
-            GOBIN=/usr/local/bin go install ./cmd/gomplate &&
-            popd &&
-            rm -rf gomplate && \
-            gomplate --version
+          GOBIN=/usr/local/bin go install github.com/hairyhenderson/gomplate/v4/cmd/[email protected]
+          gomplate --version
 
           # install shelldoc to check the README.md
           git clone https://github.com/endocode/shelldoc && \

diff --git a/.github/workflows/release-cd-builder-images.yaml b/.github/workflows/release-cd-builder-images.yaml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       matrix:
         module: [builder-go]
-        go-profile: [go-1.23, go-1.22, go-1.21, go-1.20, go-1.19]
+        go-profile: [go-1.23, go-1.22, go-1.21]
         builder-profile: [local-docker]
     steps:
       - name: Checkout sources

diff --git a/dockerfiles/cd/builders/skaffold.yaml b/dockerfiles/cd/builders/skaffold.yaml
@@ -68,7 +68,8 @@ profiles:
       - op: add
         path: /build/artifacts/0/kaniko/buildArgs
         value: &value-go1-23
-          GOLANG_VERSION: 1.23.0
+          # renovate: datasource=docker depName=golang
+          GOLANG_VERSION: 1.23.1
       - op: add
         path: /build/artifacts/1/kaniko/buildArgs
         value: *value-go1-23
@@ -105,7 +106,6 @@ profiles:
       - op: add
         path: /build/artifacts/0/kaniko/buildArgs
         value: &value-go1-21
-          # renovate: datasource=docker depName=golang
           GOLANG_VERSION: 1.21.13
       - op: add
         path: /build/artifacts/1/kaniko/buildArgs
@@ -116,43 +116,6 @@ profiles:
       - op: add
         path: /build/artifacts/3/kaniko/buildArgs
         value: *value-go1-21
-  - name: go-1.20
-    patches:
-      - op: replace
-        path: /build/tagPolicy/customTemplate/template
-        value: "{{ .SHA }}-go1.20"
-      - op: add
-        path: /build/artifacts/0/kaniko/buildArgs
-        value: &value-go1-20
-          # renovate: datasource=docker depName=golang
-          GOLANG_VERSION: 1.20.14
-      - op: add
-        path: /build/artifacts/1/kaniko/buildArgs
-        value: *value-go1-20
-      - op: add
-        path: /build/artifacts/2/kaniko/buildArgs
-        value: *value-go1-20
-      - op: add
-        path: /build/artifacts/2/kaniko/buildArgs
-        value: *value-go1-20
-  - name: go-1.19
-    patches:
-      - op: replace
-        path: /build/tagPolicy/customTemplate/template
-        value: "{{ .SHA }}-go1.19"
-      - op: add
-        path: /build/artifacts/0/kaniko/buildArgs
-        value: &value-go1-19
-          GOLANG_VERSION: 1.19.13
-      - op: add
-        path: /build/artifacts/1/kaniko/buildArgs
-        value: *value-go1-19
-      - op: add
-        path: /build/artifacts/2/kaniko/buildArgs
-        value: *value-go1-19
-      - op: add
-        path: /build/artifacts/3/kaniko/buildArgs
-        value: *value-go1-19
 
 ---
 apiVersion: skaffold/v4beta6

diff --git a/packages/README.md b/packages/README.md
@@ -27,7 +27,8 @@ Configuration template: [packages.yaml.tmpl](./packages.yaml.tmpl)
 - `(~ 6.0]`: golang `v1.18.x`
 - `[6.1 ~ 7.0)`: golang `v1.19`
 - `[7.0 ~ 7.3]`: golang `v1.20.x`
-- `[7.4 ~)`: golang `v1.21.x`
+- `[7.4 ～ 8.3]`: golang `v1.21.x`
+- `[8.4 ～ )`: golang `v1.23.x`
 
 ### Required context