Skip to content

Commit

Permalink
Build with Go 1.17
Browse files Browse the repository at this point in the history
  • Loading branch information
twpayne committed Aug 18, 2021
1 parent 518cac6 commit 137e07e
Show file tree
Hide file tree
Showing 12 changed files with 60 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .cirrus.yml
Expand Up @@ -7,7 +7,7 @@ freebsd_instance:
task:
install_script: |
pkg install -y git go
GOBIN=$PWD/bin go get golang.org/dl/go1.16.7
bin/go1.16.7 download
build_script: bin/go1.16.7 build -v ./...
test_script: bin/go1.16.7 test -race -v ./...
GOBIN=$PWD/bin go get golang.org/dl/go1.17
bin/go1.17 download
build_script: bin/go1.17 build -v ./...
test_script: bin/go1.17 test -race -v ./...
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.16.7
go-version: 1.17.0
- name: Checkout
uses: actions/checkout@v2
with:
Expand Down
47 changes: 46 additions & 1 deletion go.mod
@@ -1,6 +1,6 @@
module github.com/twpayne/chezmoi/v2

go 1.16
go 1.17

require (
github.com/Masterminds/sprig/v3 v3.2.2
Expand Down Expand Up @@ -57,4 +57,49 @@ require (
howett.net/plist v0.0.0-20201203080718-1454fab16a06
)

require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
github.com/bradenhilton/cityhash v1.0.0 // indirect
github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dlclark/regexp2 v1.4.0 // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-git/go-billy/v5 v5.3.1 // indirect
github.com/godbus/dbus/v5 v5.0.4 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/gorilla/css v1.0.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mattn/go-isatty v0.0.13 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/yuin/goldmark-emoji v1.0.1 // indirect
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
golang.org/x/text v0.3.6 // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/errgo.v2 v2.1.0 // indirect
gopkg.in/ini.v1 v1.62.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
)

exclude github.com/sergi/go-diff v1.2.0 // Produces incorrect diffs
1 change: 1 addition & 0 deletions internal/chezmoi/chezmoi_unix.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package chezmoi
Expand Down
1 change: 1 addition & 0 deletions internal/chezmoi/chezmoi_unix_test.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package chezmoi
Expand Down
1 change: 1 addition & 0 deletions internal/chezmoi/path_unix.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package chezmoi
Expand Down
1 change: 1 addition & 0 deletions internal/chezmoi/realsystem_unix.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package chezmoi
Expand Down
1 change: 1 addition & 0 deletions internal/chezmoitest/chezmoitest_unix.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package chezmoitest
Expand Down
1 change: 1 addition & 0 deletions internal/cmd/config_unix.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package cmd
Expand Down
1 change: 1 addition & 0 deletions internal/cmd/noupgradecmd.go
@@ -1,3 +1,4 @@
//go:build noupgrade || windows
// +build noupgrade windows

package cmd
Expand Down
1 change: 1 addition & 0 deletions internal/cmd/upgradecmd.go
@@ -1,3 +1,4 @@
//go:build !noupgrade && !windows
// +build !noupgrade,!windows

package cmd
Expand Down
1 change: 1 addition & 0 deletions internal/cmd/util_unix.go
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package cmd
Expand Down

0 comments on commit 137e07e

Please sign in to comment.