From a7bf8c319737b12e6fd2b765a58bf42a0b777414 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Tue, 13 Aug 2019 17:07:06 +0200 Subject: [PATCH] Fix invalid pseudo version (#945) * fix: invalid pseudo version. * fix: goreleaser configuration. * chore: ci configuration. * doc: add requirements. * doc: publish the doc more often. --- .goreleaser.yml | 20 ++++++++++---------- .travis.yml | 7 +++---- CONTRIBUTING.md | 5 +++++ docs/content/installation/_index.md | 5 +++++ go.mod | 8 ++++++++ go.sum | 9 +-------- 6 files changed, 32 insertions(+), 22 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 64290e63..51fb3816 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -28,16 +28,16 @@ builds: - goos: openbsd goarch: arm -archive: - name_template: '{{ .ProjectName }}_v{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm - }}v{{ .Arm }}{{ end }}' - format: tar.gz - format_overrides: - - goos: windows - format: zip - files: - - LICENSE - - CHANGELOG.md +archives: + - id: lego + name_template: '{{ .ProjectName }}_v{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}' + format: tar.gz + format_overrides: + - goos: windows + format: zip + files: + - LICENSE + - CHANGELOG.md release: disable: true \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index fd965a7a..4cee2c00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,9 @@ addons: - xn--lg-bja9b.wtf env: - - MEMCACHED_HOSTS=localhost:11211 GO111MODULE=on + global: + - MEMCACHED_HOSTS=localhost:11211 + - GO111MODULE=on before_install: - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_26c593b079d9_key -iv $encrypted_26c593b079d9_iv -in .gitcookies.enc -out .gitcookies -d || true' @@ -74,6 +76,3 @@ deploy: local_dir: docs/public skip_cleanup: true github_token: ${GITHUB_TOKEN} - on: - tags: true - condition: $TRAVIS_GO_VERSION =~ ^1\.x$ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c81702f0..0ab9fe7e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,6 +33,11 @@ owners to license your work under the terms of the [MIT License](LICENSE). ### How to create a pull request +Requirements: + +- `go` v1.12+ +- environment variable: `GO111MODULE=on` + First, you have to install [GoLang](https://golang.org/doc/install) and [golangci-lint](https://github.com/golangci/golangci-lint#install). ```bash diff --git a/docs/content/installation/_index.md b/docs/content/installation/_index.md index 8f70aee7..5b251fe4 100644 --- a/docs/content/installation/_index.md +++ b/docs/content/installation/_index.md @@ -40,6 +40,11 @@ pkg install lego ## From sources +Requirements: + +- `go` v1.12+ +- environment variable: `GO111MODULE=on` + To install from sources, just run: ```bash diff --git a/go.mod b/go.mod index 57a0d702..4779f2a7 100644 --- a/go.mod +++ b/go.mod @@ -50,3 +50,11 @@ require ( gopkg.in/ns1/ns1-go.v2 v2.0.0-20190430170845-6c599e5e5790 gopkg.in/square/go-jose.v2 v2.3.1 ) + +// related to invalid pseudo version used by some dependencies +// https://github.com/cloudflare/cloudflare-go/pull/334 +// https://github.com/cloudflare/cloudflare-go/pull/333 +replace ( + golang.org/x/lint => golang.org/x/lint v0.0.0-20190409202823-959b441ac422 + golang.org/x/time => golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 +) diff --git a/go.sum b/go.sum index 49478a1c..6763784a 100644 --- a/go.sum +++ b/go.sum @@ -252,12 +252,7 @@ golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaE golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190511005446-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/net v0.0.0-20180611182652-db08ff08e862/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -299,10 +294,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190513212739-9d24e82272b4 h1:RMGusaKverhgGR5KBERIKiTyWoWHRd84GCtsNlvLvIo= -golang.org/x/time v0.0.0-20190513212739-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=