From 83bc24f6c177ab3fe36539c89b6b2b2cccac773f Mon Sep 17 00:00:00 2001 From: MinerYang Date: Thu, 22 Sep 2022 17:38:26 +0800 Subject: [PATCH] Bump up golang version to v1.19 (#17588) Signed-off-by: yminer update --- .github/workflows/CI.yml | 20 ++++++++++---------- .github/workflows/build-package.yml | 4 ++-- .github/workflows/conformance_test.yml | 4 ++-- CONTRIBUTING.md | 3 ++- 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 +- src/go.mod | 2 +- tests/ci/distro_installer.sh | 4 ++-- 11 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3e3425ed6..6bac762fc 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -29,10 +29,10 @@ jobs: - ubuntu-latest timeout-minutes: 100 steps: - - name: Set up Go 1.18 + - name: Set up Go 1.19 uses: actions/setup-go@v1 with: - go-version: 1.18.5 + go-version: 1.19.1 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 @@ -95,10 +95,10 @@ jobs: - ubuntu-latest timeout-minutes: 100 steps: - - name: Set up Go 1.18 + - name: Set up Go 1.19 uses: actions/setup-go@v1 with: - go-version: 1.18.5 + go-version: 1.19.1 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 @@ -155,10 +155,10 @@ jobs: - ubuntu-latest timeout-minutes: 100 steps: - - name: Set up Go 1.18 + - name: Set up Go 1.19 uses: actions/setup-go@v1 with: - go-version: 1.18.5 + go-version: 1.19.1 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 @@ -215,10 +215,10 @@ jobs: - ubuntu-latest timeout-minutes: 100 steps: - - name: Set up Go 1.18 + - name: Set up Go 1.19 uses: actions/setup-go@v1 with: - go-version: 1.18.5 + go-version: 1.19.1 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 @@ -273,10 +273,10 @@ jobs: - ubuntu-latest timeout-minutes: 100 steps: - - name: Set up Go 1.18 + - name: Set up Go 1.19 uses: actions/setup-go@v1 with: - go-version: 1.18.5 + go-version: 1.19.1 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml index bd926d685..df04b4280 100644 --- a/.github/workflows/build-package.yml +++ b/.github/workflows/build-package.yml @@ -25,10 +25,10 @@ jobs: service_account_key: ${{ secrets.GCP_SA_KEY }} export_default_credentials: true - run: gcloud info - - name: Set up Go 1.18 + - name: Set up Go 1.19 uses: actions/setup-go@v1 with: - go-version: 1.18.5 + go-version: 1.19.1 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 diff --git a/.github/workflows/conformance_test.yml b/.github/workflows/conformance_test.yml index e11e71f5e..aaefb3f9e 100644 --- a/.github/workflows/conformance_test.yml +++ b/.github/workflows/conformance_test.yml @@ -25,10 +25,10 @@ jobs: credentials_json: '${{ secrets.GCP_CREDENTIALS }}' - uses: google-github-actions/setup-gcloud@v0 - run: gcloud info - - name: Set up Go 1.18 + - name: Set up Go 1.19 uses: actions/setup-go@v1 with: - go-version: 1.18.5 + go-version: 1.19.1 id: go - name: setup Docker uses: docker-practice/actions-setup-docker@0.0.1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bbd65b02e..c51dae1e5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -163,7 +163,8 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo | 2.3 | 1.15.12 | | 2.4 | 1.17.7 | | 2.5 | 1.17.7 | -| 2.6 | 1.18.5 | +| 2.6 | 1.18.6 | +| 2.7 | 1.19.1 | Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions. diff --git a/Makefile b/Makefile index e232fb838..127ed41b9 100644 --- a/Makefile +++ b/Makefile @@ -155,7 +155,7 @@ GOINSTALL=$(GOCMD) install GOTEST=$(GOCMD) test GODEP=$(GOTEST) -i GOFMT=gofmt -w -GOBUILDIMAGE=golang:1.18.5 +GOBUILDIMAGE=golang:1.19.1 GOBUILDPATHINCONTAINER=/harbor # go build diff --git a/make/photon/chartserver/builder b/make/photon/chartserver/builder index 1f36fcf92..6f28e1aa9 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.18.5 github.com/helm/chartmuseum v0.14.0 cmd/chartmuseum chartm" + echo "e.g: builder golang:1.19.1 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 a81fd4e9d..f9de87907 100644 --- a/make/photon/registry/Dockerfile.binary +++ b/make/photon/registry/Dockerfile.binary @@ -1,4 +1,4 @@ -FROM golang:1.18.5 +FROM golang:1.19.1 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 6474277b8..5c391c559 100644 --- a/make/photon/trivy-adapter/Dockerfile.binary +++ b/make/photon/trivy-adapter/Dockerfile.binary @@ -1,4 +1,4 @@ -FROM golang:1.18.5 +FROM golang:1.19.1 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 3a5b6303a..23f4e4730 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.18.5..." +echo "Building Trivy adapter binary based on golang:1.19.1..." 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 index bdada30fb..9fbdace8e 100644 --- a/src/go.mod +++ b/src/go.mod @@ -1,6 +1,6 @@ module github.com/goharbor/harbor/src -go 1.18 +go 1.19 require ( github.com/FZambia/sentinel v1.1.0 diff --git a/tests/ci/distro_installer.sh b/tests/ci/distro_installer.sh index bd5e7f007..19dc879ce 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.18.5 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.18.5 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.1 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.1 COMPILETAG=compile_golangimage NOTARYFLAG=true CHARTFLAG=true TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false