diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml index 4abcbf3..3406603 100644 --- a/.github/workflows/reviewdog.yml +++ b/.github/workflows/reviewdog.yml @@ -5,46 +5,14 @@ jobs: name: runner / golangci-lint runs-on: ubuntu-latest steps: - - name: set up - uses: actions/setup-go@v1 - with: - go-version: 1.12 - id: go - - - name: Add $GOPATH/bin - run: | - echo ::add-path::$(go env GOPATH)/bin - - name: Check out code into the Go module directory uses: actions/checkout@v1 - - # cache store - - name: cache - uses: actions/cache@v1 + - name: golangci-lint + uses: reviewdog/action-golangci-lint@v1 with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go- - - - name: download modules - # キャッシュが保存されていればそれを使う - if: steps.cache.outputs.cache-hit != 'true' - run: go mod download - - - name: Setup reviewdog - run: | - curl -sfL https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh| sh -s -- -b $(go env GOPATH)/bin - - - name: install lint - run: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.18.0 - - - name: Run reviewdog - env: - REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - golangci-lint run --out-format line-number --enable-all --exclude-use-default=false -c=./.golangci.yml \ - | reviewdog -f=golangci-lint -name="golangci-lint" -reporter="github-check" + github_token: ${{ secrets.github_token }} + golangci_lint_flags: "--enable-all --exclude-use-default=false ./..." + reporter: github-check misspell: name: runner / misspell diff --git a/cmd/envdef/envdef.go b/cmd/envdef/envdef.go index 205935d..a5a95cd 100644 --- a/cmd/envdef/envdef.go +++ b/cmd/envdef/envdef.go @@ -11,11 +11,12 @@ func main() { defaultSource := ".env.sample" defaultDist := ".env" - var source string + source := "" + dist := "" + overwrite := false + flag.StringVar(&source, "s", defaultSource, "source .env file") - var dist string flag.StringVar(&dist, "d", defaultDist, "distribution .env file") - var overwrite bool flag.BoolVar(&overwrite, "o", false, "Whether to overwrite when the key already exists.") flag.Parse() @@ -29,5 +30,6 @@ func main() { if err != nil { log.Fatal(err) } + result.Print() } diff --git a/go.mod b/go.mod index 8b3d988..e0c4b00 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,13 @@ module github.com/locona/envdef go 1.12 require ( + github.com/davecgh/go-spew v1.1.1 // indirect github.com/fatih/color v1.9.0 github.com/joho/godotenv v1.3.0 + github.com/kr/pretty v0.1.0 // indirect github.com/mattn/go-colorable v0.1.6 // indirect github.com/stretchr/testify v1.5.1 golang.org/x/sys v0.0.0-20200316230553-a7d97aace0b0 // indirect + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect + gopkg.in/yaml.v2 v2.2.8 // indirect ) diff --git a/go.sum b/go.sum index 968799c..a01d117 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,16 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -26,5 +33,9 @@ golang.org/x/sys v0.0.0-20200316230553-a7d97aace0b0 h1:4Khi5GeNOkZS5DqSBRn4Sy7BE golang.org/x/sys v0.0.0-20200316230553-a7d97aace0b0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=