Skip to content

Commit

Permalink
Merge pull request #618 from twpayne/go-1.14
Browse files Browse the repository at this point in the history
Build with Go 1.14
  • Loading branch information
twpayne authored Mar 6, 2020
2 parents ce06ed9 + ea3d8d2 commit ec3b896
Show file tree
Hide file tree
Showing 4 changed files with 91 additions and 90 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
strategy:
matrix:
go-version:
- 1.13.x
- 1.14.x
os:
- macos-latest
- ubuntu-latest
Expand All @@ -24,7 +24,7 @@ jobs:
- name: Install tools
if: matrix.os == 'ubuntu-latest'
run: |
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.22.2
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.23.8
cd $(mktemp -d)
go mod init tmp
go get mvdan.cc/gofumpt/gofumports
Expand All @@ -38,7 +38,7 @@ jobs:
- name: Run
run: go run . --version
- name: Test
run: go test -race ./...
run: go test ./... # FIXME add -race when https://github.com/etcd-io/bbolt/issues/187 is fixed
- name: Lint
if: matrix.os == 'ubuntu-latest'
run: $(go env GOPATH)/bin/golangci-lint run
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: 1.13.x
go-version: 1.14.x
- name: Checkout
uses: actions/checkout@v1
- name: Download Go modules
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ generate:

.PHONY: install-tools
install-tools:
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- v1.23.3
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- v1.23.8
( cd $$(mktemp -d) && go mod init tmp && go get mvdan.cc/gofumpt/gofumports )

.PHONY: lint
Expand All @@ -57,7 +57,8 @@ test-release:

.PHONY: test
test:
go test -race ./...
# FIXME add -race when https://github.com/etcd-io/bbolt/issues/187 is fixed
go test ./...

.PHONY: update-install.sh
update-install.sh:
Expand Down
164 changes: 82 additions & 82 deletions cmd/docs.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ documentation, and shell completions.

| OS | Architectures | Archive |
| ---------- | --------------------------------------------------- | -------------------------------------------------------------- |
| FreeBSD | `amd64`, `arm`, `i386` | [`tar.gz`](https://github.com/twpayne/chezmoi/releases/latest) |
| FreeBSD | `amd64`, `arm`, `arm64`, `i386` | [`tar.gz`](https://github.com/twpayne/chezmoi/releases/latest) |
| Linux | `amd64`, `arm`, `arm64`, `i386`, `ppc64`, `ppc64le` | [`tar.gz`](https://github.com/twpayne/chezmoi/releases/latest) |
| macOS | `amd64` | [`tar.gz`](https://github.com/twpayne/chezmoi/releases/latest) |
| OpenBSD | `amd64`, `arm`, `i386` | [`tar.gz`](https://github.com/twpayne/chezmoi/releases/latest) |
| OpenBSD | `amd64`, `arm`, `arm64`, `i386` | [`tar.gz`](https://github.com/twpayne/chezmoi/releases/latest) |
| Windows | `amd64`, `i386` | [`zip`](https://github.com/twpayne/chezmoi/releases/latest) |

## All pre-built Linux packages and binaries
Expand Down

0 comments on commit ec3b896

Please sign in to comment.