TrueCloudLab/distribution
13
0
Fork 3
Code Issues 3 Pull requests Projects Releases 2 Packages Wiki Activity Actions

bump up golang version

Browse source 
upgrade go version to v1.18.8

Signed-off-by: Wang Yan <wangyan@vmware.com>
This commit is contained in:
Wang Yan 2022-11-29 22:42:26 +08:00 committed by Sebastiaan van Stijn
parent db1389e043
commit 70db3a46d9
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
8 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View file

@ -25,7 +25,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.17.* go-version: 1.18.8
- name: Dependencies - name: Dependencies
run: | run: |
@ -39,7 +39,7 @@ jobs:
DCO_VERBOSITY=-q script/validate/dco DCO_VERBOSITY=-q script/validate/dco
GO111MODULE=on script/setup/install-dev-tools GO111MODULE=on script/setup/install-dev-tools
script/validate/vendor script/validate/vendor
go build -i . go build .
make check make check
make build make build
make binaries make binaries

2
Dockerfile
View file

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG GO_VERSION=1.17 ARG GO_VERSION=1.18.8
ARG ALPINE_VERSION=3.16 ARG ALPINE_VERSION=3.16
ARG XX_VERSION=1.1.1 ARG XX_VERSION=1.1.1

2
Makefile
View file

@ -50,7 +50,7 @@ version/version.go:
check: ## run all linters (TODO: enable "unused", "varcheck", "ineffassign", "unconvert", "staticheck", "goimports", "structcheck") check: ## run all linters (TODO: enable "unused", "varcheck", "ineffassign", "unconvert", "staticheck", "goimports", "structcheck")
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
golangci-lint run @GO111MODULE=off golangci-lint run
test: ## run tests, except integration test with test.short test: ## run tests, except integration test with test.short
@echo "$(WHALE) $@" @echo "$(WHALE) $@"

6
context/http.go
View file

@ -246,11 +246,7 @@ func (ctx *muxVarsContext) Value(key interface{}) interface{} {
return ctx.vars return ctx.vars
} }
if strings.HasPrefix(keyStr, "vars.") { if v, ok := ctx.vars[strings.TrimPrefix(keyStr, "vars.")]; ok {
keyStr = strings.TrimPrefix(keyStr, "vars.")
}
if v, ok := ctx.vars[keyStr]; ok {
return v return v
} }
} }

2
project/dev-image/Dockerfile
View file

@ -17,4 +17,4 @@ RUN wget https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz --quiet && \
tar -C /usr/local -xzf go$GOLANG_VERSION.linux-amd64.tar.gz && \ tar -C /usr/local -xzf go$GOLANG_VERSION.linux-amd64.tar.gz && \
rm go${GOLANG_VERSION}.linux-amd64.tar.gz rm go${GOLANG_VERSION}.linux-amd64.tar.gz
RUN go get github.com/axw/gocov/gocov github.com/mattn/goveralls github.com/golang/lint/golint RUN go install github.com/axw/gocov/gocov@latest github.com/mattn/goveralls@latest github.com/golang/lint/golint@latest

4
registry/client/repository.go
View file

@ -114,9 +114,7 @@ func (r *registry) Repositories(ctx context.Context, entries []string, last stri
return 0, err return 0, err
} }
for cnt := range ctlg.Repositories { copy(entries, ctlg.Repositories)
entries[cnt] = ctlg.Repositories[cnt]
}
numFilled = len(ctlg.Repositories) numFilled = len(ctlg.Repositories)
link := resp.Header.Get("Link") link := resp.Header.Get("Link")

6
script/setup/install-dev-tools
View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
GOLANGCI_LINT_VERSION="v1.27.0" GOLANGCI_LINT_VERSION="v1.50.1"
# #
# Install developer tools to $GOBIN (or $GOPATH/bin if unset) # Install developer tools to $GOBIN (or $GOPATH/bin if unset)
@ -8,5 +8,5 @@ GOLANGCI_LINT_VERSION="v1.27.0"
set -eu -o pipefail set -eu -o pipefail
cd /tmp cd /tmp
go get -u github.com/LK4D4/vndr go install github.com/LK4D4/vndr@latest
go get "github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}" go install "github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}"

2
version/version.sh
View file

@ -17,7 +17,7 @@ var Package = "$(go list)"
// Version indicates which version of the binary is running. This is set to // Version indicates which version of the binary is running. This is set to
// the latest release tag by hand, always suffixed by "+unknown". During // the latest release tag by hand, always suffixed by "+unknown". During
// build, it will be replaced by the actual version. The value here will be // build, it will be replaced by the actual version. The value here will be
// used if the registry is run after a go get based install. // used if the registry is run after a go install based install.
var Version = "$(git describe --match 'v[0-9]*' --dirty='.m' --always)+unknown" var Version = "$(git describe --match 'v[0-9]*' --dirty='.m' --always)+unknown"
// Revision is filled with the VCS (e.g. git) revision being used to build // Revision is filled with the VCS (e.g. git) revision being used to build