[ci] golangci version to 1.57.2 | golang to 1.22 | fix ci issue

rancher · May 17, 2024 · 81fdbee · 81fdbee
1 parent 3da4365
commit 81fdbee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -1,11 +1,11 @@
-FROM registry.suse.com/bci/golang:1.20
+FROM registry.suse.com/bci/golang:1.22
 
 ARG DAPPER_HOST_ARCH
 ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH}
 
 RUN zypper -n in docker awk
 
-RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.52.2
+RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.57.2
 
 ENV DAPPER_SOURCE /go/src/github.com/rancher/rke/
 ENV DAPPER_RUN_ARGS --privileged -v /var/lib/docker

diff --git a/util/util.go b/util/util.go
@@ -134,13 +134,14 @@ func GetTagMajorVersion(tag string) string {
 }
 
 func IsFileExists(filePath string) (bool, error) {
-	if _, err := os.Stat(filePath); err == nil {
+	var err error
+	if _, err = os.Stat(filePath); err == nil {
 		return true, nil
-	} else if os.IsNotExist(err) {
+	}
+	if os.IsNotExist(err) {
 		return false, nil
-	} else {
-		return false, err
 	}
+	return false, err
 }
 
 func GetDefaultRKETools(image string) (string, error) {