Skip to content

Commit 25f1cbb

Browse files
committed
update modules
1 parent bfab24e commit 25f1cbb

File tree

7 files changed

+26
-25
lines changed

7 files changed

+26
-25
lines changed

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
- name: Checkout
1111
uses: actions/checkout@v2
1212
with:
13-
fetch-depth: 1
13+
fetch-depth: 0
1414
- name: Setup Go
1515
uses: actions/setup-go@v2
1616
with:
17-
go-version: 1.16
17+
go-version: 1.17
1818
- name: Run GoReleaser
1919
uses: goreleaser/goreleaser-action@v2
2020
with:

.goreleaser.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ before:
55
hooks:
66
- go mod tidy
77
builds:
8-
-
9-
main: ./gih/main.go
8+
- main: ./cmd/main.go
109
binary: gih
1110
ldflags:
1211
- -s -w
13-
- -X main.version={{ .Version }}
14-
- -X main.commit={{ .ShortCommit }}
15-
- -X main.date={{ .Date }}
12+
- -X main.version={{.Version}}
13+
- -X main.commit={{.ShortCommit}}
14+
- -X main.date={{.Date}}
1615
env:
1716
- CGO_ENABLED=0
1817
goos:
@@ -23,13 +22,12 @@ builds:
2322
- goos: darwin
2423
goarch: 386
2524
archives:
26-
-
27-
name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
25+
- name_template: "{{.ProjectName}}_{{.Os}}_{{.Arch}}_{{.Version}}"
2826
format: binary
2927
checksum:
3028
name_template: 'checksums.txt'
3129
snapshot:
32-
name_template: "{{ .Tag }}-next"
30+
name_template: "{{.Tag}}-next"
3331
changelog:
3432
sort: asc
3533
filters:

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ tidy:
1414
go mod tidy
1515

1616
update_all:
17-
go get -v all
17+
go get -u -v ./...
1818

1919
outdated:
2020
go list -m -u all

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ It is to simplify development. You can start right away just by cloning.
8383
```
8484
$ git clone git@github.com:takecy/git-here.git
8585
$ cd git-here
86-
$ DEBUG=* go run gih/main.go version
86+
$ DEBUG=* go run cmd/main.go version
8787
```
8888

8989
### Testing

gih/main.go cmd/main.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ import (
1414

1515
// set by build
1616
var (
17-
version = "unset"
18-
commit = "unset"
19-
date = "unset"
17+
version = "0.13.2"
18+
commit = "unset"
19+
date = "unset"
20+
builtBy = "unset"
21+
goversion = "1.17.0"
2022
)
2123

2224
const usage = `Run git command to all repositories in the current directory.
@@ -58,7 +60,7 @@ func main() {
5860
}
5961

6062
if flag.Arg(0) == "version" {
61-
checkUpdate()
63+
// checkUpdate()
6264
fmt.Fprintf(os.Stdout, "git-here %s\n", version)
6365
return
6466
}

go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ require (
99
github.com/google/go-querystring v1.1.0 // indirect
1010
github.com/kr/text v0.2.0 // indirect
1111
github.com/matryer/is v1.4.0
12-
github.com/mattn/go-isatty v0.0.13 // indirect
12+
github.com/mattn/go-isatty v0.0.14 // indirect
1313
github.com/pkg/errors v0.9.1
1414
github.com/rhysd/go-github-selfupdate v1.2.3
1515
github.com/ulikunitz/xz v0.5.10 // indirect
1616
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
17-
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
17+
golang.org/x/net v0.0.0-20210908191846-a5e095526f91 // indirect
1818
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
1919
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
20-
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
20+
golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365 // indirect
2121
google.golang.org/appengine v1.6.7 // indirect
2222
google.golang.org/protobuf v1.27.1 // indirect
2323
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect

go.sum

+7-6
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwM
134134
github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
135135
github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
136136
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
137-
github.com/mattn/go-isatty v0.0.13 h1:qdl+GuBjcsKKDco5BsxPJlId98mSWNKqYA+Co0SC1yA=
138-
github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
137+
github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
138+
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
139139
github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw=
140140
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
141141
github.com/onsi/gomega v1.4.2 h1:3mYCb7aPxS/RU7TI1y4rkEn1oKmPRjNJLNEXgw7MH2I=
@@ -228,8 +228,8 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R
228228
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
229229
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
230230
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
231-
golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw=
232-
golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
231+
golang.org/x/net v0.0.0-20210908191846-a5e095526f91 h1:E8wdt+zBjoxD3MA65wEc3pl25BsTi7tbkpwc4ANThjc=
232+
golang.org/x/net v0.0.0-20210908191846-a5e095526f91/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
233233
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
234234
golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
235235
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -280,8 +280,9 @@ golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7w
280280
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
281281
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
282282
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
283-
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf h1:2ucpDCmfkl8Bd/FsLtiD653Wf96cW37s+iGx93zsu4k=
284-
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
283+
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
284+
golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365 h1:6wSTsvPddg9gc/mVEEyk9oOAoxn+bT4Z9q1zx+4RwA4=
285+
golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
285286
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
286287
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
287288
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

0 commit comments

Comments
 (0)