bump golang 1.20.2 (#18469)

Signed-off-by: yminer <yminer@vmware.com>
2024-11-22 02:05:41 +01:00 · 2023-04-04 10:59:16 +08:00 · 2023-04-04 10:59:16 +08:00 · de20659da5
commit de20659da5
parent a7cef5e24f
9 changed files with 14 additions and 13 deletions
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@ -36,7 +36,7 @@ jobs:
      - name: Set up Go 1.20
        uses: actions/setup-go@v1
        with:
-           go-version: 1.20.1
+           go-version: 1.20.2
        id: go
      - uses: actions/checkout@v3
        with:
@ -97,7 +97,7 @@ jobs:
      - name: Set up Go 1.20
        uses: actions/setup-go@v1
        with:
-          go-version: 1.20.1
+          go-version: 1.20.2
        id: go
      - uses: actions/checkout@v3
        with:
@ -152,7 +152,7 @@ jobs:
      - name: Set up Go 1.20
        uses: actions/setup-go@v1
        with:
-          go-version: 1.20.1
+          go-version: 1.20.2
        id: go
      - uses: actions/checkout@v3
        with:
@ -207,7 +207,7 @@ jobs:
      - name: Set up Go 1.20
        uses: actions/setup-go@v1
        with:
-          go-version: 1.20.1
+          go-version: 1.20.2
        id: go
      - uses: actions/checkout@v3
        with:
@ -260,7 +260,7 @@ jobs:
      - name: Set up Go 1.20
        uses: actions/setup-go@v1
        with:
-          go-version: 1.20.1
+          go-version: 1.20.2
        id: go
      - uses: actions/checkout@v3
        with:
--- a/.github/workflows/build-package.yml
+++ b/.github/workflows/build-package.yml
@ -26,7 +26,7 @@ jobs:
      - name: Set up Go 1.20
        uses: actions/setup-go@v1
        with:
-          go-version: 1.20.1
+          go-version: 1.20.2
        id: go
      - name: Setup Docker
        uses: docker-practice/actions-setup-docker@1.0.11
--- a/.github/workflows/conformance_test.yml
+++ b/.github/workflows/conformance_test.yml
@ -28,7 +28,7 @@ jobs:
      - name: Set up Go 1.20
        uses: actions/setup-go@v1
        with:
-          go-version: 1.20.1
+          go-version: 1.20.2
        id: go
      - uses: actions/checkout@v3
        with:
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -165,6 +165,7 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo
 |   2.5    |    1.17.7     |
 |   2.6    |    1.18.6     |
 |   2.7    |    1.19.4     |
+|   2.8    |    1.20.2     |

 Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions.

--- a/2
+++ b/2
@ -145,7 +145,7 @@ GOINSTALL=$(GOCMD) install
 GOTEST=$(GOCMD) test
 GODEP=$(GOTEST) -i
 GOFMT=gofmt -w
-GOBUILDIMAGE=golang:1.20.1
+GOBUILDIMAGE=golang:1.20.2
 GOBUILDPATHINCONTAINER=/harbor

 # go build
--- a/make/photon/registry/Dockerfile.binary
+++ b/make/photon/registry/Dockerfile.binary
@ -1,4 +1,4 @@
-FROM golang:1.20.1
+FROM golang:1.20.2

 ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
 ENV BUILDTAGS include_oss include_gcs
--- a/make/photon/trivy-adapter/Dockerfile.binary
+++ b/make/photon/trivy-adapter/Dockerfile.binary
@ -1,4 +1,4 @@
-FROM golang:1.20.1
+FROM golang:1.20.2

 ADD .   /go/src/github.com/aquasecurity/harbor-scanner-trivy/
 WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy/
--- 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.20.1..."
+echo "Building Trivy adapter binary based on golang:1.20.2..."
 cp Dockerfile.binary $TEMP
 docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP

--- 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.20.1 COMPILETAG=compile_golangimage NOTARYFLAG=true 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.20.1 COMPILETAG=compile_golangimage NOTARYFLAG=true 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.20.2 COMPILETAG=compile_golangimage NOTARYFLAG=true 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.20.2 COMPILETAG=compile_golangimage NOTARYFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false