Miscellaneous Go 1.17 fixes

twpayne · Aug 22, 2021 · ed95a58 · ed95a58
1 parent 5445841
commit ed95a58
Show file tree

Hide file tree

Showing 7 changed files with 127 additions and 10 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,6 +1,4 @@
-# [Choice] Go version: 1, 1.15, 1.14
-# FIXME remove dev- when 1.16 container is published
-ARG VARIANT=dev-1.16
+ARG VARIANT=dev-1.17
 FROM mcr.microsoft.com/vscode/devcontainers/go:${VARIANT}
 
 # [Optional] Uncomment this section to install additional OS packages.

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -22,7 +22,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
     - name: Cache Go modules
@@ -128,7 +128,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
     - name: Cache Go modules
@@ -148,7 +148,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
     - name: Cache Go modules
@@ -188,7 +188,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:

diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
@@ -20,7 +20,7 @@ chezmoi's source code.
 
 ## Developing locally
 
-chezmoi requires Go 1.16 or later.
+chezmoi requires Go 1.17 or later.
 
 chezmoi is a standard Go project, using standard Go tooling, with a few extra
 tools. Ensure that these extra tools are installed with:

diff --git a/docs/FAQ.md b/docs/FAQ.md
@@ -370,7 +370,7 @@ lock include `diff`, `status`, and `verify`.
 
 ## I'm getting errors trying to build chezmoi from source
 
-chezmoi requires Go version 1.16 or later. You can check the version of Go with:
+chezmoi requires Go version 1.17 or later. You can check the version of Go with:
 
 ```console
 $ go version

diff --git a/docs/INSTALL.md b/docs/INSTALL.md
@@ -102,4 +102,4 @@ Download, build, and install chezmoi for your system:
 $ go install github.com/twpayne/chezmoi@latest
 ```
 
-Building chezmoi requires Go 1.16 or later.
+Building chezmoi requires Go 1.17 or later.
diff --git a/go.sum b/go.sum
diff --git a/internal/cmds/lint-whitespace/main.go b/internal/cmds/lint-whitespace/main.go
@@ -23,6 +23,7 @@ var (
 		regexp.MustCompile(`\Aassets/chezmoi\.io/themes/book\z`),
 		regexp.MustCompile(`\Aassets/scripts/install\.ps1\z`),
 		regexp.MustCompile(`\Acompletions/chezmoi\.ps1\z`),
+		regexp.MustCompile(`\Adist\z`),
 	}
 	crlfLineEndingRx     = regexp.MustCompile(`\r\z`)
 	trailingWhitespaceRx = regexp.MustCompile(`\s+\z`)