From 101fd2125cd4ff6dd5e4ab8252000365b3b4ea79 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 14 Jun 2019 10:41:46 -0400 Subject: [PATCH] updating github.com/client9/misspell to v0.3.4 --- go.mod | 4 +- go.sum | 4 +- vendor/github.com/client9/misspell/.gitignore | 1 + .../github.com/client9/misspell/.travis.yml | 16 +++++-- vendor/github.com/client9/misspell/Dockerfile | 2 +- vendor/github.com/client9/misspell/Gopkg.lock | 17 +++++-- vendor/github.com/client9/misspell/Gopkg.toml | 18 +++++--- vendor/github.com/client9/misspell/Makefile | 20 +++------ .../client9/misspell/RELEASE-HOWTO.md | 23 +++++++--- .../client9/misspell/goreleaser.yml | 45 +++++++++++-------- vendor/modules.txt | 2 +- 11 files changed, 95 insertions(+), 57 deletions(-) diff --git a/go.mod b/go.mod index 585241fc21f..0d5177ae5f2 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/boltdb/bolt v1.3.1 // indirect github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 - github.com/client9/misspell v0.0.0-20170928000206-9ce5d979ffda + github.com/client9/misspell v0.3.4 github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313 github.com/codedellemc/goscaleio v0.0.0-20170830184815-20e2ce2cf885 @@ -219,7 +219,7 @@ replace ( github.com/boltdb/bolt => github.com/boltdb/bolt v1.3.1 github.com/cespare/prettybench => github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c github.com/chai2010/gettext-go => github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 - github.com/client9/misspell => github.com/client9/misspell v0.0.0-20170928000206-9ce5d979ffda + github.com/client9/misspell => github.com/client9/misspell v0.3.4 github.com/cloudflare/cfssl => github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf github.com/clusterhq/flocker-go => github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313 github.com/codedellemc/goscaleio => github.com/codedellemc/goscaleio v0.0.0-20170830184815-20e2ce2cf885 diff --git a/go.sum b/go.sum index 7c21b000e3e..63f4297b06c 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c h1:p8i+qCbr/dN github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c/go.mod h1:Xe6ZsFhtM8HrDku0pxJ3/Lr51rwykrzgFwpmTzleatY= github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 h1:7aWHqerlJ41y6FOsEUvknqgXnGmJyJSbjhAWq5pO4F8= github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= -github.com/client9/misspell v0.0.0-20170928000206-9ce5d979ffda h1:QBkCW6crBwWeRDhv99atmW1EZ7gyxAlHA2tGu+P9020= -github.com/client9/misspell v0.0.0-20170928000206-9ce5d979ffda/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf h1:eOyFuj3h/Vj5e4voOM16NNrHsUR3jhD0duh76LHMj6Y= github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA= github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313 h1:eIHD9GNM3Hp7kcRW5mvcz7WTR3ETeoYYKwpgA04kaXE= diff --git a/vendor/github.com/client9/misspell/.gitignore b/vendor/github.com/client9/misspell/.gitignore index aaca9b8f905..b1b707e3260 100644 --- a/vendor/github.com/client9/misspell/.gitignore +++ b/vendor/github.com/client9/misspell/.gitignore @@ -1,5 +1,6 @@ dist/ bin/ +vendor/ # editor turds *~ diff --git a/vendor/github.com/client9/misspell/.travis.yml b/vendor/github.com/client9/misspell/.travis.yml index 5c9f465caea..e63e6c2bdcc 100644 --- a/vendor/github.com/client9/misspell/.travis.yml +++ b/vendor/github.com/client9/misspell/.travis.yml @@ -3,10 +3,18 @@ dist: trusty group: edge language: go go: - - 1.8.3 + - "1.10" git: depth: 1 + script: - - make -e ci -after_success: - - test -n "$TRAVIS_TAG" && ./scripts/goreleaser.sh + - ./scripts/travis.sh + +# calls goreleaser when a new tag is pushed +deploy: +- provider: script + skip_cleanup: true + script: curl -sL http://git.io/goreleaser | bash + on: + tags: true + condition: $TRAVIS_OS_NAME = linux diff --git a/vendor/github.com/client9/misspell/Dockerfile b/vendor/github.com/client9/misspell/Dockerfile index 8b1207c61be..b8ea37b4c5a 100644 --- a/vendor/github.com/client9/misspell/Dockerfile +++ b/vendor/github.com/client9/misspell/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.8.3-alpine +FROM golang:1.10.0-alpine # cache buster RUN echo 4 diff --git a/vendor/github.com/client9/misspell/Gopkg.lock b/vendor/github.com/client9/misspell/Gopkg.lock index d58726a0b92..90ed45115f9 100644 --- a/vendor/github.com/client9/misspell/Gopkg.lock +++ b/vendor/github.com/client9/misspell/Gopkg.lock @@ -3,13 +3,22 @@ [[projects]] name = "github.com/gobwas/glob" - packages = [".","compiler","match","syntax","syntax/ast","syntax/lexer","util/runes","util/strings"] - revision = "bea32b9cd2d6f55753d94a28e959b13f0244797a" - version = "v0.2.2" + packages = [ + ".", + "compiler", + "match", + "syntax", + "syntax/ast", + "syntax/lexer", + "util/runes", + "util/strings" + ] + revision = "5ccd90ef52e1e632236f7326478d4faa74f99438" + version = "v0.2.3" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "e481c81c87260652d25840e1d95d6e530331c095d64d84422a166f37ae0a77d3" + inputs-digest = "087ea4c49358ea8258ad9edfe514cd5ce9975c889c258e5ec7b5d2b720aae113" solver-name = "gps-cdcl" solver-version = 1 diff --git a/vendor/github.com/client9/misspell/Gopkg.toml b/vendor/github.com/client9/misspell/Gopkg.toml index efabaa461d4..e9b8e6a45a9 100644 --- a/vendor/github.com/client9/misspell/Gopkg.toml +++ b/vendor/github.com/client9/misspell/Gopkg.toml @@ -1,7 +1,6 @@ - # Gopkg.toml example # -# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md +# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html # for detailed Gopkg.toml documentation. # # required = ["github.com/user/thing/cmd/thing"] @@ -17,10 +16,19 @@ # source = "github.com/myfork/project2" # # [[override]] -# name = "github.com/x/y" -# version = "2.4.0" +# name = "github.com/x/y" +# version = "2.4.0" +# +# [prune] +# non-go = false +# go-tests = true +# unused-packages = true [[constraint]] name = "github.com/gobwas/glob" - version = "0.2.2" + version = "0.2.3" + +[prune] + go-tests = true + unused-packages = true diff --git a/vendor/github.com/client9/misspell/Makefile b/vendor/github.com/client9/misspell/Makefile index 0ccf74862c2..862ab77b0d6 100644 --- a/vendor/github.com/client9/misspell/Makefile +++ b/vendor/github.com/client9/misspell/Makefile @@ -4,25 +4,15 @@ install: ## install misspell into GOPATH/bin go install ./cmd/misspell build: hooks ## build and lint misspell - go install ./cmd/misspell - gometalinter \ - --vendor \ - --deadline=60s \ - --disable-all \ - --enable=vet \ - --enable=golint \ - --enable=gofmt \ - --enable=goimports \ - --enable=gosimple \ - --enable=staticcheck \ - --enable=ineffassign \ - --exclude=/usr/local/go/src/net/lookup_unix.go \ - ./... - go test . + ./scripts/build.sh test: ## run all tests go test . +# real publishing is done only by travis +publish: ## test goreleaser + ./scripts/goreleaser-dryrun.sh + # the grep in line 2 is to remove misspellings in the spelling dictionary # that trigger false positives!! falsepositives: /scowl-wl diff --git a/vendor/github.com/client9/misspell/RELEASE-HOWTO.md b/vendor/github.com/client9/misspell/RELEASE-HOWTO.md index 7caf7ee1631..55b52d962e9 100644 --- a/vendor/github.com/client9/misspell/RELEASE-HOWTO.md +++ b/vendor/github.com/client9/misspell/RELEASE-HOWTO.md @@ -5,21 +5,34 @@ since I forget. 1. Review existing tags and pick new release number - ```bash + ```sh git tag ``` 2. Tag locally - ```bash + ```sh git tag -a v0.1.0 -m "First release" ``` -3. Push + If things get screwed up, delete the tag with + + ```sh + git tag -d v0.1.0 + ``` + +3. Test goreleaser + + TODO: how to install goreleaser + + ```sh + ./scripts/goreleaser-dryrun.sh + ``` + +4. Push ```bash git push origin v0.1.0 ``` -4. Verify release and edit notes. See https://github.com/client9/misspell/releases - +5. Verify release and edit notes. See https://github.com/client9/misspell/releases diff --git a/vendor/github.com/client9/misspell/goreleaser.yml b/vendor/github.com/client9/misspell/goreleaser.yml index 2bd738f8b08..560cb3810c4 100644 --- a/vendor/github.com/client9/misspell/goreleaser.yml +++ b/vendor/github.com/client9/misspell/goreleaser.yml @@ -1,22 +1,26 @@ # goreleaser.yml # https://github.com/goreleaser/goreleaser -build: - main: cmd/misspell/main.go - binary: misspell - ldflags: -s -w -X main.version={{.Version}} - goos: - - darwin - - linux - - windows - goarch: - - amd64 - env: - - CGO_ENABLED=0 - ignore: - - goos: darwin - goarch: 386 - - goos: windows - goarch: 386 + +project_name: misspell + +builds: + - + main: cmd/misspell/main.go + binary: misspell + ldflags: -s -w -X main.version={{.Version}} + goos: + - darwin + - linux + - windows + goarch: + - amd64 + env: + - CGO_ENABLED=0 + ignore: + - goos: darwin + goarch: 386 + - goos: windows + goarch: 386 archive: name_template: "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}" @@ -24,6 +28,11 @@ archive: amd64: 64bit 386: 32bit darwin: mac + files: + - none* + +checksum: + name_template: "{{ .ProjectName }}_{{ .Version }}_checksums.txt" snapshot: - name_template: SNAPSHOT-{{.Commit}} + name_template: "SNAPSHOT-{{.Commit}}" diff --git a/vendor/modules.txt b/vendor/modules.txt index f143460cf8a..e293b9fc76e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -138,7 +138,7 @@ github.com/chai2010/gettext-go/gettext github.com/chai2010/gettext-go/gettext/mo github.com/chai2010/gettext-go/gettext/plural github.com/chai2010/gettext-go/gettext/po -# github.com/client9/misspell v0.0.0-20170928000206-9ce5d979ffda => github.com/client9/misspell v0.0.0-20170928000206-9ce5d979ffda +# github.com/client9/misspell v0.3.4 => github.com/client9/misspell v0.3.4 github.com/client9/misspell github.com/client9/misspell/cmd/misspell # github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf => github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf