bump golang to 1.22.2

Signed-off-by: yminer <yminer@vmware.com> replace go get to go install Signed-off-by: yminer <yminer@vmware.com> remove go get in ut_install update ci
goharbor · Apr 11, 2024 · 6ffe0bb · 6ffe0bb
1 parent e9d2f50
commit 6ffe0bb
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 32 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -41,10 +41,10 @@ jobs:
       - ubuntu-latest
     timeout-minutes: 100
     steps:
-      - name: Set up Go 1.21
+      - name: Set up Go 1.22
         uses: actions/setup-go@v5
         with:
-           go-version: 1.21.8
+           go-version: 1.22.2
         id: go
       - uses: actions/checkout@v3
         with:
@@ -102,10 +102,10 @@ jobs:
       - ubuntu-latest
     timeout-minutes: 100
     steps:
-      - name: Set up Go 1.21
+      - name: Set up Go 1.22
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.8
+          go-version: 1.22.2
         id: go
       - uses: actions/checkout@v3
         with:
@@ -157,10 +157,10 @@ jobs:
       - ubuntu-latest
     timeout-minutes: 100
     steps:
-      - name: Set up Go 1.21
+      - name: Set up Go 1.22
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.8
+          go-version: 1.22.2
         id: go
       - uses: actions/checkout@v3
         with:
@@ -212,10 +212,10 @@ jobs:
       - ubuntu-latest
     timeout-minutes: 100
     steps:
-      - name: Set up Go 1.21
+      - name: Set up Go 1.22
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.8
+          go-version: 1.22.2
         id: go
       - uses: actions/checkout@v3
         with:
@@ -265,10 +265,10 @@ jobs:
       - ubuntu-latest
     timeout-minutes: 100
     steps:
-      - name: Set up Go 1.21
+      - name: Set up Go 1.22
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.8
+          go-version: 1.22.2
         id: go
       - uses: actions/checkout@v3
         with:

diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml
@@ -23,10 +23,10 @@ jobs:
         with:
           version: '430.0.0'
       - run: gcloud info
-      - name: Set up Go 1.21
+      - name: Set up Go 1.22
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.8
+          go-version: 1.22.2
         id: go
       - name: Setup Docker
         uses: docker-practice/actions-setup-docker@master

diff --git a/.github/workflows/conformance_test.yml b/.github/workflows/conformance_test.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up Go 1.21
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.8
+          go-version: 1.22.2
         id: go
       - uses: actions/checkout@v3
         with:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -164,7 +164,8 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo
 |   2.7    |    1.19.4     |
 |   2.8    |    1.20.6     |
 |   2.9    |    1.21.3     |
-|   2.10    |   1.21.8     |
+|   2.10   |    1.21.8     |
+|   2.11   |    1.22.2     |
 
 
 Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions.

diff --git a/Makefile b/Makefile
@@ -140,7 +140,7 @@ GOINSTALL=$(GOCMD) install
 GOTEST=$(GOCMD) test
 GODEP=$(GOTEST) -i
 GOFMT=gofmt -w
-GOBUILDIMAGE=golang:1.21.8
+GOBUILDIMAGE=golang:1.22.2
 GOBUILDPATHINCONTAINER=/harbor
 
 # go build

diff --git a/make/photon/registry/Dockerfile.binary b/make/photon/registry/Dockerfile.binary
@@ -1,4 +1,4 @@
-FROM golang:1.21.8
+FROM golang:1.22.2
 
 ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
 ENV BUILDTAGS include_oss include_gcs

diff --git a/make/photon/trivy-adapter/Dockerfile.binary b/make/photon/trivy-adapter/Dockerfile.binary
@@ -1,4 +1,4 @@
-FROM golang:1.21.8
+FROM golang:1.22.2
 
 ADD .   /go/src/github.com/aquasecurity/harbor-scanner-trivy/
 WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy/

diff --git a/make/photon/trivy-adapter/builder.sh b/make/photon/trivy-adapter/builder.sh
@@ -19,7 +19,7 @@ TEMP=$(mktemp -d ${TMPDIR-/tmp}/trivy-adapter.XXXXXX)
 git clone https://github.com/aquasecurity/harbor-scanner-trivy.git $TEMP
 cd $TEMP; git checkout $VERSION; cd -
 
-echo "Building Trivy adapter binary based on golang:1.21.8..."
+echo "Building Trivy adapter binary based on golang:1.22.2..."
 cp Dockerfile.binary $TEMP
 docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP
 

diff --git a/src/go.mod b/src/go.mod
@@ -1,6 +1,6 @@
 module github.com/goharbor/harbor/src
 
-go 1.21
+go 1.22
 
 require (
 	github.com/FZambia/sentinel v1.1.0

diff --git a/tests/ci/distro_installer.sh b/tests/ci/distro_installer.sh
@@ -3,5 +3,5 @@ set -x
 
 set -e
 
-sudo make package_online GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-gitaction PKGVERSIONTAG=dev-gitaction UIVERSIONTAG=dev-gitaction GOBUILDIMAGE=golang:1.21.8 COMPILETAG=compile_golangimage TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false
-sudo make package_offline GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-gitaction PKGVERSIONTAG=dev-gitaction UIVERSIONTAG=dev-gitaction GOBUILDIMAGE=golang:1.21.8 COMPILETAG=compile_golangimage TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false
+sudo make package_online GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-gitaction PKGVERSIONTAG=dev-gitaction UIVERSIONTAG=dev-gitaction GOBUILDIMAGE=golang:1.22.2 COMPILETAG=compile_golangimage TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false
+sudo make package_offline GOBUILDTAGS="include_oss include_gcs" VERSIONTAG=dev-gitaction PKGVERSIONTAG=dev-gitaction UIVERSIONTAG=dev-gitaction GOBUILDIMAGE=golang:1.22.2 COMPILETAG=compile_golangimage TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false
diff --git a/tests/ci/ut_install.sh b/tests/ci/ut_install.sh
@@ -5,19 +5,19 @@ set -e
 
 sudo apt-get update && sudo apt-get install -y libldap2-dev
 sudo go env -w GO111MODULE=auto
-go get github.com/docker/distribution
-go get github.com/docker/libtrust
-go get golang.org/x/lint/golint
-go get github.com/GeertJohan/fgt
-go get github.com/dghubble/sling
-set +e
-go get github.com/stretchr/testify
-go get golang.org/x/tools/cmd/cover
-go get github.com/mattn/goveralls
-go get -u github.com/client9/misspell/cmd/misspell
+pwd
+# cd ./src
+# go get github.com/docker/distribution@latest
+# go get github.com/docker/libtrust@latest
+# set +e
+# go get github.com/stretchr/testify@v1.8.4
+go install golang.org/x/tools/cmd/cover@latest
+go install github.com/mattn/goveralls@latest
+go install github.com/client9/misspell/cmd/misspell@latest
 set -e
+# cd ../
 # binary will be $(go env GOPATH)/bin/golangci-lint
-# go install/go get installation aren't guaranteed to work. We recommend using binary installation.
+# go get installation aren't guaranteed to work. We recommend using binary installation.
 curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
 sudo service postgresql stop || echo no postgresql need to be stopped
 sleep 2