From d168f080ed3fceaaafa0bedfe9b5b84d0ca06d10 Mon Sep 17 00:00:00 2001 From: MinerYang Date: Thu, 15 Dec 2022 13:55:30 +0800 Subject: [PATCH] bump up golang to 1.19.4 for main (#17997) bump up golang to 1.19.4 in main Signed-off-by: yminer Signed-off-by: yminer --- .github/workflows/CI.yml | 10 +++++----- .github/workflows/build-package.yml | 2 +- .github/workflows/conformance_test.yml | 2 +- CONTRIBUTING.md | 2 +- Makefile | 2 +- make/photon/chartserver/builder | 2 +- make/photon/registry/Dockerfile.binary | 2 +- make/photon/trivy-adapter/Dockerfile.binary | 2 +- make/photon/trivy-adapter/builder.sh | 2 +- tests/ci/distro_installer.sh | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ebeaaae32..62abf7dc3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -32,7 +32,7 @@ jobs: - name: Set up Go 1.19 uses: actions/setup-go@v1 with: - go-version: 1.19.3 + go-version: 1.19.4 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@1.0.11 @@ -98,7 +98,7 @@ jobs: - name: Set up Go 1.19 uses: actions/setup-go@v1 with: - go-version: 1.19.3 + go-version: 1.19.4 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@1.0.11 @@ -158,7 +158,7 @@ jobs: - name: Set up Go 1.19 uses: actions/setup-go@v1 with: - go-version: 1.19.3 + go-version: 1.19.4 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@1.0.11 @@ -218,7 +218,7 @@ jobs: - name: Set up Go 1.19 uses: actions/setup-go@v1 with: - go-version: 1.19.3 + go-version: 1.19.4 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@1.0.11 @@ -276,7 +276,7 @@ jobs: - name: Set up Go 1.19 uses: actions/setup-go@v1 with: - go-version: 1.19.3 + go-version: 1.19.4 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@1.0.11 diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml index ebe31d2d6..77c99f157 100644 --- a/.github/workflows/build-package.yml +++ b/.github/workflows/build-package.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Go 1.19 uses: actions/setup-go@v1 with: - go-version: 1.19.3 + go-version: 1.19.4 id: go - name: Setup Docker uses: docker-practice/actions-setup-docker@1.0.11 diff --git a/.github/workflows/conformance_test.yml b/.github/workflows/conformance_test.yml index 9e7a09816..da9230f64 100644 --- a/.github/workflows/conformance_test.yml +++ b/.github/workflows/conformance_test.yml @@ -28,7 +28,7 @@ jobs: - name: Set up Go 1.19 uses: actions/setup-go@v1 with: - go-version: 1.19.3 + go-version: 1.19.4 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@1.0.11 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 85b7acd3e..105dcc91b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -164,7 +164,7 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo | 2.4 | 1.17.7 | | 2.5 | 1.17.7 | | 2.6 | 1.18.6 | -| 2.7 | 1.19.3 | +| 2.7 | 1.19.4 | Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions. diff --git a/Makefile b/Makefile index 494908bde..8a183a85e 100644 --- a/Makefile +++ b/Makefile @@ -155,7 +155,7 @@ GOINSTALL=$(GOCMD) install GOTEST=$(GOCMD) test GODEP=$(GOTEST) -i GOFMT=gofmt -w -GOBUILDIMAGE=golang:1.19.3 +GOBUILDIMAGE=golang:1.19.4 GOBUILDPATHINCONTAINER=/harbor # go build diff --git a/make/photon/chartserver/builder b/make/photon/chartserver/builder index 4e2a09537..765566120 100755 --- a/make/photon/chartserver/builder +++ b/make/photon/chartserver/builder @@ -4,7 +4,7 @@ set +e usage(){ echo "Usage: builder " - echo "e.g: builder golang:1.19.3 github.com/helm/chartmuseum v0.14.0 cmd/chartmuseum chartm" + echo "e.g: builder golang:1.19.4 github.com/helm/chartmuseum v0.14.0 cmd/chartmuseum chartm" exit 1 } diff --git a/make/photon/registry/Dockerfile.binary b/make/photon/registry/Dockerfile.binary index 0b4b1af94..66cbef59e 100644 --- a/make/photon/registry/Dockerfile.binary +++ b/make/photon/registry/Dockerfile.binary @@ -1,4 +1,4 @@ -FROM golang:1.19.3 +FROM golang:1.19.4 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 index 6b849e49d..74da679e4 100644 --- a/make/photon/trivy-adapter/Dockerfile.binary +++ b/make/photon/trivy-adapter/Dockerfile.binary @@ -1,4 +1,4 @@ -FROM golang:1.19.3 +FROM golang:1.19.4 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 index 70f25e23d..d4ded148e 100755 --- 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.19.3..." +echo "Building Trivy adapter binary based on golang:1.19.4..." cp Dockerfile.binary $TEMP docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP diff --git a/tests/ci/distro_installer.sh b/tests/ci/distro_installer.sh index 708201410..982c872bd 100755 --- 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.19.3 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=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.19.3 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=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.19.4 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=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.19.4 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false