Iterate on infrastructure (#524)

Iterate on infrastructure

Author: twpayne

.github/workflows/main.yml

@@ -12,10 +12,17 @@ jobs:
       uses: actions/checkout@v1
     - name: Download Go modules
       run: go mod download
+    - name: Install tools
+      run: |
+        curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.21.0
+        cd $(mktemp -d)
+        go mod init tmp
+        go get github.com/gobuffalo/packr/v2/packr2
+        go get mvdan.cc/gofumpt/gofumports
     - name: Generate
       run: |
-        GO111MODULE=off go get -u github.com/gobuffalo/packr/v2/packr2
-        make generate
+        $(go env GOPATH)/bin/packr2
+        go generate ./...
         git diff --exit-code
     - name: Build
       run: go build ./...
@@ -24,17 +31,16 @@ jobs:
     - name: Test
       run: go test -race ./...
     - name: Lint
-      run: |
-        curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- v1.21.0
-        make lint
+      run: $(go env GOPATH)/bin/golangci-lint run
     - name: Check formatting
       run: |
-        GO111MODULE=off go get -u mvdan.cc/gofumpt/gofumports
-        make format
+        find . -name \*.go | xargs $(go env GOPATH)/bin/gofumports -w
         git diff --exit-code
     - name: Check completions
       run: |
-        make completions
+        go run . completion bash > completions/chezmoi-completion.bash
+        go run . completion fish > completions/chezmoi.fish
+        go run . completion zsh > completions/chezmoi.zsh
         git diff --exit-code
   macos-ci:
     runs-on: macos-latest
@@ -47,11 +53,6 @@ jobs:
       uses: actions/checkout@v1
     - name: Download Go modules
       run: go mod download
-    - name: Generate
-      run: |
-        GO111MODULE=off go get -u github.com/gobuffalo/packr/v2/packr2
-        make generate
-        git diff --exit-code
     - name: Build
       run: go build ./...
     - name: Run
@@ -91,10 +92,19 @@ jobs:
       uses: actions/checkout@v1
     - name: Download Go modules
       run: go mod download
+    - name: Install tools
+      run: |
+        curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- v1.21.0
+        cd $(mktemp -d)
+        go mod init tmp
+        go get github.com/gobuffalo/packr/v2/packr2
     - name: Generate
       run: |
-        GO111MODULE=off go get -u github.com/gobuffalo/packr/v2/packr2
-        make generate
+        $(go env GOPATH)/bin/packr2
+        go generate ./...
+        go run . completion bash > completions/chezmoi-completion.bash
+        go run . completion fish > completions/chezmoi.fish
+        go run . completion zsh > completions/chezmoi.zsh
         git diff --exit-code
     - name: Set up Snapcraft
       env:

cmd/helps.gen.go

@@ -0,0 +1,3 @@
+package cmd
+
+//go:generate go run github.com/twpayne/chezmoi/internal/extract-helps -i ../docs/REFERENCE.md -o helps.gen.go

cmd/helps.go

@@ -45,7 +45,7 @@ text (the output of `chezmoi command --help`) and the website
 
 If you update `docs/REFERENCE.md` you must also run
 
-    make generate
+    go generate ./...
 
 to extract and generate the help text. This will update `cmd/helps.gen.go`.
 

docs/CONTRIBUTING.md

@@ -5,10 +5,10 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+	"go/format"
 	"io"
 	"io/ioutil"
 	"os"
-	"os/exec"
 	"strings"
 	"text/tabwriter"
 	"text/template"
@@ -27,7 +27,7 @@ var (
 		"printMultiLineString": printMultiLineString,
 	}
 
-	outputTemplate = template.Must(template.New("output").Funcs(funcs).Parse(`//go:generate go run github.com/twpayne/chezmoi/internal/extract-helps -i {{ .InputFile }} -o {{ .OutputFile }}
+	outputTemplate = template.Must(template.New("output").Funcs(funcs).Parse(`// Code generated by github.com/twpayne/chezmoi/internal/extract-helps. DO NOT EDIT.
 
 package cmd
 
@@ -38,12 +38,10 @@ type help struct {
 
 var helps = map[string]help{
 {{- range $command, $help := .Helps }}
-	"{{ $command }}": help{
+	"{{ $command }}": {
+		long: {{ printMultiLineString $help.Long "\t\t\t" }},
 {{- if $help.Example }}
-		long:    {{ printMultiLineString $help.Long "\t\t\t" }},
 		example: {{ printMultiLineString $help.Example "\t\t\t" }},
-{{- else }}
-		long: {{ printMultiLineString $help.Long "\t\t\t" }},
 {{- end }}
 	},
 {{- end }}
@@ -408,10 +406,13 @@ func run() error {
 		return err
 	}
 
-	cmd := exec.Command("gofmt", "-s")
-	cmd.Stdin = buf
-	cmd.Stdout = w
-	return cmd.Run()
+	output, err := format.Source(buf.Bytes())
+	if err != nil {
+		return err
+	}
+
+	_, err = w.Write(output)
+	return err
 }
 
 func main() {

internal/extract-helps/main.go

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
-# Code generated by godownloader on 2019-10-05T16:08:39Z. DO NOT EDIT.
+# Code generated by godownloader on 2019-12-12T19:33:38Z. DO NOT EDIT.
 #
 
 usage() {
@@ -114,6 +114,9 @@ tag_to_version() {
 }
 adjust_format() {
   # change format (tar.gz or zip) based on OS
+  case ${OS} in
+    windows) FORMAT=zip ;;
+  esac
   true
 }
 adjust_os() {