Skip to content

Commit 87d18ec

Browse files
new gorelease template, github ci workflow, arm64 (#18)
1 parent 11856e4 commit 87d18ec

File tree

7 files changed

+95
-59
lines changed

7 files changed

+95
-59
lines changed

.github/workflows/ci.yml

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: goreleaser
2+
3+
on:
4+
push:
5+
tags:
6+
- '*'
7+
8+
permissions:
9+
contents: write
10+
11+
jobs:
12+
goreleaser:
13+
runs-on: ubuntu-latest
14+
steps:
15+
-
16+
name: Checkout
17+
uses: actions/checkout@v3
18+
with:
19+
fetch-depth: 0
20+
-
21+
name: Set up Go
22+
uses: actions/setup-go@v3
23+
with:
24+
go-version: 1.19
25+
-
26+
name: Login to GitHub Container Registry
27+
uses: docker/login-action@v2
28+
with:
29+
registry: ghcr.io
30+
username: ${{ github.actor }}
31+
password: ${{ secrets.GITHUB_TOKEN }}
32+
-
33+
name: Run GoReleaser
34+
uses: goreleaser/goreleaser-action@v2
35+
with:
36+
distribution: goreleaser
37+
version: latest
38+
args: release --rm-dist
39+
env:
40+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
jplot
2+
dist/

.goreleaser.yml

+42-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,46 @@
11
project_name: jplot
2+
before:
3+
hooks:
4+
- go mod tidy
5+
- go generate ./...
26
builds:
3-
-
4-
env:
5-
- CGO_ENABLED=0
6-
goos:
7-
- darwin
8-
git:
9-
short_hash: true
10-
brew:
11-
github:
12-
owner: rs
13-
name: homebrew-tap
14-
commit_author:
15-
name: Olivier Poitrey
16-
email: rs@rhapsodyk.net
17-
homepage: https://github.com/rs/jplot
18-
description: iTerm2 expvar/JSON monitoring tool
7+
- env:
8+
- CGO_ENABLED=0
9+
goos:
10+
- darwin
11+
goarch:
12+
- amd64
13+
- arm
14+
- arm64
15+
goamd64:
16+
- v1
17+
- v2
18+
- v3
19+
universal_binaries:
20+
-
21+
name_template: '{{.ProjectName}}'
22+
checksum:
23+
name_template: 'checksums.txt'
24+
snapshot:
25+
name_template: "{{ incpatch .Version }}_next"
26+
changelog:
27+
sort: asc
28+
filters:
29+
exclude:
30+
- '^docs:'
31+
- '^test:'
32+
brews:
33+
- tap:
34+
owner: rs
35+
name: homebrew-tap
36+
branch: main
37+
commit_msg_template: "Brew formula update for {{ .ProjectName }} version {{ .Tag }}"
38+
commit_author:
39+
name: Olivier Poitrey
40+
email: rs@rhapsodyk.net
41+
homepage: https://github.com/rs/jplot
42+
description: iTerm2 expvar/JSON monitoring tool
43+
1944

2045
release:
21-
name_template: "{{.ProjectName}}-v{{.Version}}"
46+
name_template: "{{.ProjectName}}-v{{.Version}}"

.travis.yml

-21
This file was deleted.

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,12 @@ jplot --url http://:8080/debug/vars \
109109

110110
### Vegeta
111111

112-
With the help of [jaggr](https://github.com/rs/jaggr) can be used to integrate [vegeta](https://github.com/tsenart/vegeta) with jplot as follow:
112+
With the help of [jplot](https://github.com/rs/jplot) can be used to integrate [vegeta](https://github.com/tsenart/vegeta) with jplot as follow:
113113

114114
```
115115
echo 'GET http://localhost:8080' | \
116116
vegeta attack -rate 5000 -workers 100 -duration 10m | vegeta dump | \
117-
jaggr @count=rps \
117+
jplot @count=rps \
118118
hist\[100,200,300,400,500\]:code \
119119
p25,p50,p95:latency \
120120
sum:bytes_in \

go.mod

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
module github.com/rs/jplot
22

3-
go 1.14
3+
go 1.19
44

55
require (
6-
github.com/davecgh/go-spew v1.1.1 // indirect
76
github.com/dustin/go-humanize v1.0.0
87
github.com/elgs/gojq v0.0.0-20201120033525-b5293fef2759
9-
github.com/elgs/gosplitargs v0.0.0-20161028071935-a491c5eeb3c8 // indirect
10-
github.com/kr/pretty v0.1.0 // indirect
118
github.com/mattn/go-isatty v0.0.14
129
github.com/mattn/go-sixel v0.0.1
1310
github.com/monochromegane/terminal v0.0.0-20161222050454-9bc47e2707d9
14-
github.com/soniakeys/quant v1.0.0 // indirect
15-
github.com/stretchr/testify v1.7.0 // indirect
1611
github.com/wcharczuk/go-chart/v2 v2.1.0
1712
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871
13+
)
14+
15+
require (
16+
github.com/davecgh/go-spew v1.1.1 // indirect
17+
github.com/elgs/gosplitargs v0.0.0-20161028071935-a491c5eeb3c8 // indirect
18+
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
19+
github.com/soniakeys/quant v1.0.0 // indirect
20+
github.com/stretchr/testify v1.7.0 // indirect
1821
golang.org/x/image v0.0.0-20211028202545-6944b10bf410 // indirect
1922
golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1 // indirect
2023
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
21-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
2224
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
2325
)

go.sum

-12
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ github.com/elgs/gosplitargs v0.0.0-20161028071935-a491c5eeb3c8 h1:bD2/rCXwgXJm2v
99
github.com/elgs/gosplitargs v0.0.0-20161028071935-a491c5eeb3c8/go.mod h1:o4DgpccPNAQAlPSxo7I4L/LWNh2oyr/BBGSynrLTmZM=
1010
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
1111
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
12-
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
13-
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
14-
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
15-
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
16-
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
1712
github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
1813
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
1914
github.com/mattn/go-sixel v0.0.1 h1:rhJSpux2xjsmXdXqY694uiEC0Rwxt6jYoq7Bahqo2xs=
@@ -34,22 +29,15 @@ golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0
3429
golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
3530
golang.org/x/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ=
3631
golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
37-
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
38-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
39-
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
40-
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4132
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4233
golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1 h1:kwrAHlwJ0DUBZwQ238v+Uod/3eZ8B2K5rYsUHBQvzmI=
4334
golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
44-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
4535
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
4636
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
4737
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
4838
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
4939
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
5040
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
51-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
52-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5341
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
5442
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
5543
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)