mirror of
https://github.com/helm/helm.git
synced 2026-05-28 04:35:48 -04:00
bump Go 1.18
Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
parent
79cd4dda81
commit
39b0a82365
7 changed files with 14 additions and 12 deletions
|
|
@ -5,7 +5,7 @@ jobs:
|
|||
build:
|
||||
working_directory: ~/helm.sh/helm
|
||||
docker:
|
||||
- image: circleci/golang:1.17
|
||||
- image: cimg/go:1.18
|
||||
|
||||
auth:
|
||||
username: $DOCKER_USER
|
||||
|
|
@ -13,7 +13,7 @@ jobs:
|
|||
|
||||
environment:
|
||||
GOCACHE: "/tmp/go/cache"
|
||||
GOLANGCI_LINT_VERSION: "1.43.0"
|
||||
GOLANGCI_LINT_VERSION: "1.46.2"
|
||||
|
||||
steps:
|
||||
- checkout
|
||||
|
|
|
|||
6
.github/workflows/build-pr.yml
vendored
6
.github/workflows/build-pr.yml
vendored
|
|
@ -12,7 +12,7 @@ jobs:
|
|||
- name: Setup Go
|
||||
uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: '1.17'
|
||||
go-version: '1.18'
|
||||
- name: Install golangci-lint
|
||||
run: |
|
||||
curl -sSLO https://github.com/golangci/golangci-lint/releases/download/v$GOLANGCI_LINT_VERSION/golangci-lint-$GOLANGCI_LINT_VERSION-linux-amd64.tar.gz
|
||||
|
|
@ -21,8 +21,8 @@ jobs:
|
|||
sudo mv golangci-lint-$GOLANGCI_LINT_VERSION-linux-amd64/golangci-lint /usr/local/bin/golangci-lint
|
||||
rm -rf golangci-lint-$GOLANGCI_LINT_VERSION-linux-amd64*
|
||||
env:
|
||||
GOLANGCI_LINT_VERSION: '1.43.0'
|
||||
GOLANGCI_LINT_SHA256: 'f3515cebec926257da703ba0a2b169e4a322c11dc31a8b4656b50a43e48877f4'
|
||||
GOLANGCI_LINT_VERSION: '1.46.2'
|
||||
GOLANGCI_LINT_SHA256: '242cd4f2d6ac0556e315192e8555784d13da5d1874e51304711570769c4f2b9b'
|
||||
- name: Test style
|
||||
run: make test-style
|
||||
- name: Run unit tests
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@ import (
|
|||
"github.com/pkg/errors"
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/spf13/cobra/doc"
|
||||
"golang.org/x/text/cases"
|
||||
"golang.org/x/text/language"
|
||||
|
||||
"helm.sh/helm/v3/cmd/helm/require"
|
||||
)
|
||||
|
|
@ -84,7 +86,7 @@ func (o *docsOptions) run(out io.Writer) error {
|
|||
hdrFunc := func(filename string) string {
|
||||
base := filepath.Base(filename)
|
||||
name := strings.TrimSuffix(base, path.Ext(base))
|
||||
title := strings.Title(strings.Replace(name, "_", " ", -1))
|
||||
title := cases.Title(language.Und).String(strings.Replace(name, "_", " ", -1))
|
||||
return fmt.Sprintf("---\ntitle: \"%s\"\n---\n\n", title)
|
||||
}
|
||||
|
||||
|
|
|
|||
4
go.mod
4
go.mod
|
|
@ -1,6 +1,6 @@
|
|||
module helm.sh/helm/v3
|
||||
|
||||
go 1.17
|
||||
go 1.18
|
||||
|
||||
require (
|
||||
github.com/BurntSushi/toml v1.1.0
|
||||
|
|
@ -33,6 +33,7 @@ require (
|
|||
github.com/xeipuuv/gojsonschema v1.2.0
|
||||
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
|
||||
golang.org/x/text v0.3.7
|
||||
k8s.io/api v0.24.1
|
||||
k8s.io/apiextensions-apiserver v0.24.1
|
||||
k8s.io/apimachinery v0.24.1
|
||||
|
|
@ -147,7 +148,6 @@ require (
|
|||
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
|
||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
|
||||
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
|
||||
golang.org/x/text v0.3.7 // indirect
|
||||
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
|
||||
google.golang.org/appengine v1.6.7 // indirect
|
||||
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ func AssertGoldenString(t TestingT, actual, filename string) {
|
|||
t.Helper()
|
||||
|
||||
if err := compare([]byte(actual), path(filename)); err != nil {
|
||||
t.Fatalf("%v", err)
|
||||
t.Fatalf("%v\n", err)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -79,7 +79,7 @@ func compare(actual []byte, filename string) error {
|
|||
}
|
||||
expected = normalize(expected)
|
||||
if !bytes.Equal(expected, actual) {
|
||||
return errors.Errorf("does not match golden file %s\n\nWANT:\n'%s'\n\nGOT:\n'%s'\n", filename, expected, actual)
|
||||
return errors.Errorf("does not match golden file %s\n\nWANT:\n'%s'\n\nGOT:\n'%s'", filename, expected, actual)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ func (v Values) Table(name string) (Values, error) {
|
|||
//
|
||||
// It protects against nil map panics.
|
||||
func (v Values) AsMap() map[string]interface{} {
|
||||
if v == nil || len(v) == 0 {
|
||||
if len(v) == 0 {
|
||||
return map[string]interface{}{}
|
||||
}
|
||||
return v
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ coverdir=$(mktemp -d /tmp/coverage.XXXXXXXXXX)
|
|||
profile="${coverdir}/cover.out"
|
||||
|
||||
pushd /
|
||||
hash goveralls 2>/dev/null || go get github.com/mattn/goveralls
|
||||
hash goveralls 2>/dev/null || go install github.com/mattn/goveralls@v0.0.11
|
||||
popd
|
||||
|
||||
generate_cover_data() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue