upgrade go version to 1.22.3 (#63)

* upgrade go version to 1.22.3 * add more replace for mergerun * fix
matrixorigin · Jun 4, 2024 · 51c0910 · 51c0910
1 parent dbfff1b
commit 51c0910
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/merge-trigger-tke.yaml b/.github/workflows/merge-trigger-tke.yaml
@@ -59,7 +59,10 @@ jobs:
           # # add tencentyun docker image mirror and tencentyun apt mirror
           sed -i 's#^RUN apt-get update#RUN sed -i "s?http.*ubuntu\.com?http://mirrors\.ustc\.edu\.cn?g" /etc/apt/sources.list  \&\& apt-get clean all \&\& apt-get update#g' optools/images/Dockerfile
           sed -i 's#FROM golang:1.21.5-bookworm as builder#FROM ccr.ccs.tencentyun.com/cicd-runner/golang:1.21.5-bookworm as builder#g' optools/images/Dockerfile
-          sed -i 's#FROM ubuntu:22.04#FROM ccr.ccs.tencentyun.com/cicd-runner/ubuntu:22.04#g' optools/images/Dockerfile
+          sed -i 's#FROM ubuntu:22.04#FROM ccr.ccs.tencentyun.com/mo-infra/ubuntu:22.04#g' optools/images/Dockerfile
+
+          # adjust for go 1.22.3
+          sed -i 's#FROM golang:1.22.3-bookworm as builder#FROM ccr.ccs.tencentyun.com/mo-infra/golang:1.22.3-bookworm as builder#g' optools/images/Dockerfile
 
           docker build -t $TAGS -f optools/images/Dockerfile . --build-arg GOPROXY='https://goproxy.cn,direct'
           docker push $TAGS

diff --git a/actions/setup-env/action.yaml b/actions/setup-env/action.yaml
@@ -4,7 +4,7 @@ inputs:
   go-version:
     description: 'version of golang'
     required: false
-    default: "1.21.5"
+    default: "1.22.3"
   setup-java:
     description: 'version of golang'
     required: false