bump golang to 1.22.2 (#20256)

Signed-off-by: yminer <yminer@vmware.com>

replace go get to go install

update go.mod
This commit is contained in:
MinerYang 2024-04-12 13:46:29 +08:00 committed by GitHub
parent e9d2f50669
commit 7e8032b144
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 36 additions and 32 deletions

View File

@ -41,10 +41,10 @@ jobs:
- ubuntu-latest - ubuntu-latest
timeout-minutes: 100 timeout-minutes: 100
steps: steps:
- name: Set up Go 1.21 - name: Set up Go 1.22
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: 1.21.8 go-version: 1.22.2
id: go id: go
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -102,10 +102,10 @@ jobs:
- ubuntu-latest - ubuntu-latest
timeout-minutes: 100 timeout-minutes: 100
steps: steps:
- name: Set up Go 1.21 - name: Set up Go 1.22
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: 1.21.8 go-version: 1.22.2
id: go id: go
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -157,10 +157,10 @@ jobs:
- ubuntu-latest - ubuntu-latest
timeout-minutes: 100 timeout-minutes: 100
steps: steps:
- name: Set up Go 1.21 - name: Set up Go 1.22
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: 1.21.8 go-version: 1.22.2
id: go id: go
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -212,10 +212,10 @@ jobs:
- ubuntu-latest - ubuntu-latest
timeout-minutes: 100 timeout-minutes: 100
steps: steps:
- name: Set up Go 1.21 - name: Set up Go 1.22
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: 1.21.8 go-version: 1.22.2
id: go id: go
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -265,10 +265,10 @@ jobs:
- ubuntu-latest - ubuntu-latest
timeout-minutes: 100 timeout-minutes: 100
steps: steps:
- name: Set up Go 1.21 - name: Set up Go 1.22
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: 1.21.8 go-version: 1.22.2
id: go id: go
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:

View File

@ -23,10 +23,10 @@ jobs:
with: with:
version: '430.0.0' version: '430.0.0'
- run: gcloud info - run: gcloud info
- name: Set up Go 1.21 - name: Set up Go 1.22
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: 1.21.8 go-version: 1.22.2
id: go id: go
- name: Setup Docker - name: Setup Docker
uses: docker-practice/actions-setup-docker@master uses: docker-practice/actions-setup-docker@master

View File

@ -47,5 +47,8 @@ jobs:
# make bootstrap # make bootstrap
# make release # make release
# to make sure autobuild success, specifify golang version in go.mod
# https://github.com/github/codeql/issues/15647#issuecomment-2003768106
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3 uses: github/codeql-action/analyze@v3

View File

@ -28,7 +28,7 @@ jobs:
- name: Set up Go 1.21 - name: Set up Go 1.21
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: 1.21.8 go-version: 1.22.2
id: go id: go
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:

View File

@ -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.7 | 1.19.4 |
| 2.8 | 1.20.6 | | 2.8 | 1.20.6 |
| 2.9 | 1.21.3 | | 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. Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions.

View File

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

View File

@ -1,4 +1,4 @@
FROM golang:1.21.8 FROM golang:1.22.2
ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
ENV BUILDTAGS include_oss include_gcs ENV BUILDTAGS include_oss include_gcs

View File

@ -1,4 +1,4 @@
FROM golang:1.21.8 FROM golang:1.22.2
ADD . /go/src/github.com/aquasecurity/harbor-scanner-trivy/ ADD . /go/src/github.com/aquasecurity/harbor-scanner-trivy/
WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy/ WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy/

View File

@ -19,7 +19,7 @@ TEMP=$(mktemp -d ${TMPDIR-/tmp}/trivy-adapter.XXXXXX)
git clone https://github.com/aquasecurity/harbor-scanner-trivy.git $TEMP git clone https://github.com/aquasecurity/harbor-scanner-trivy.git $TEMP
cd $TEMP; git checkout $VERSION; cd - 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 cp Dockerfile.binary $TEMP
docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP

View File

@ -1,6 +1,6 @@
module github.com/goharbor/harbor/src module github.com/goharbor/harbor/src
go 1.21 go 1.22.2
require ( require (
github.com/FZambia/sentinel v1.1.0 github.com/FZambia/sentinel v1.1.0

View File

@ -3,5 +3,5 @@ set -x
set -e 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_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.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.22.2 COMPILETAG=compile_golangimage TRIVYFLAG=true HTTPPROXY= PULL_BASE_FROM_DOCKERHUB=false

View File

@ -5,19 +5,19 @@ set -e
sudo apt-get update && sudo apt-get install -y libldap2-dev sudo apt-get update && sudo apt-get install -y libldap2-dev
sudo go env -w GO111MODULE=auto sudo go env -w GO111MODULE=auto
go get github.com/docker/distribution pwd
go get github.com/docker/libtrust # cd ./src
go get golang.org/x/lint/golint # go get github.com/docker/distribution@latest
go get github.com/GeertJohan/fgt # go get github.com/docker/libtrust@latest
go get github.com/dghubble/sling # set +e
set +e # go get github.com/stretchr/testify@v1.8.4
go get github.com/stretchr/testify go install golang.org/x/tools/cmd/cover@latest
go get golang.org/x/tools/cmd/cover go install github.com/mattn/goveralls@latest
go get github.com/mattn/goveralls go install github.com/client9/misspell/cmd/misspell@latest
go get -u github.com/client9/misspell/cmd/misspell
set -e set -e
# cd ../
# binary will be $(go env GOPATH)/bin/golangci-lint # 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 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 sudo service postgresql stop || echo no postgresql need to be stopped
sleep 2 sleep 2