From 26b51d2d2d62139c6f58a076aa1b146ab0cb3e9d Mon Sep 17 00:00:00 2001 From: Chandan Pasunoori Date: Tue, 27 Dec 2022 09:59:05 +0530 Subject: [PATCH] new gorelease template, github ci workflow, arm64 --- .github/workflows/ci.yml | 40 +++++++++++++++++++++++++++ .gitignore | 2 ++ .goreleaser.yml | 59 ++++++++++++++++++++++++++++------------ .travis.yml | 21 -------------- README.md | 4 +-- go.mod | 16 ++++++----- go.sum | 12 -------- 7 files changed, 95 insertions(+), 59 deletions(-) create mode 100644 .github/workflows/ci.yml create mode 100644 .gitignore delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..e15617b --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,40 @@ +name: goreleaser + +on: + push: + tags: + - '*' + +permissions: + contents: write + +jobs: + goreleaser: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - + name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: 1.19 + - + name: Login to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - + name: Run GoReleaser + uses: goreleaser/goreleaser-action@v2 + with: + distribution: goreleaser + version: latest + args: release --rm-dist + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bed8f42 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +jplot +dist/ diff --git a/.goreleaser.yml b/.goreleaser.yml index 1a58250..e671103 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,21 +1,46 @@ project_name: jplot +before: + hooks: + - go mod tidy + - go generate ./... builds: -- - env: - - CGO_ENABLED=0 - goos: - - darwin -git: - short_hash: true -brew: - github: - owner: rs - name: homebrew-tap - commit_author: - name: Olivier Poitrey - email: rs@rhapsodyk.net - homepage: https://github.com/rs/jplot - description: iTerm2 expvar/JSON monitoring tool + - env: + - CGO_ENABLED=0 + goos: + - darwin + goarch: + - amd64 + - arm + - arm64 + goamd64: + - v1 + - v2 + - v3 +universal_binaries: + - + name_template: '{{.ProjectName}}' +checksum: + name_template: 'checksums.txt' +snapshot: + name_template: "{{ incpatch .Version }}_next" +changelog: + sort: asc + filters: + exclude: + - '^docs:' + - '^test:' +brews: + - tap: + owner: rs + name: homebrew-tap + branch: main + commit_msg_template: "Brew formula update for {{ .ProjectName }} version {{ .Tag }}" + commit_author: + name: Olivier Poitrey + email: rs@rhapsodyk.net + homepage: https://github.com/rs/jplot + description: iTerm2 expvar/JSON monitoring tool + release: - name_template: "{{.ProjectName}}-v{{.Version}}" \ No newline at end of file + name_template: "{{.ProjectName}}-v{{.Version}}" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2680a73..0000000 --- a/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -language: go -go: -- '1.10' -- '1.11' -- '1.12' -- master -matrix: - allow_failures: - - go: master -script: go test -v -race -cpu=1,2,4 -bench . -benchmem ./... -deploy: -- provider: script - skip_cleanup: true - script: curl -sL http://git.io/goreleaser | bash - on: - tags: true - condition: "$TRAVIS_OS_NAME = linux && $TRAVIS_GO_VERSION = '1.10'" -env: - global: - # travis encrypt GITHUB_TOKEN=$GITHUB_TOKEN --add - secure: I9Yst+EOHkjqLzRSbF1ivVdrSEXx3FZ98pK9SAf6xY0v6PBBRovWFHhfEWoeecgawcrHb+C/CKT/Tk3CYSmn1HWB6TTbSnL70LD0aGv+Zc4TnSFTj9X8gJbUkjV1nFKANBpef/IxftlGA5U7LWrDNzuiaMF8Rv2XHaH63vgEuv/9O4NZcuB/z+QdPIWHGH7cKz8AOb4SaR1uAVX/lZBMVzp3VuPU4WC2XkVYruaJMrUs1mhMrY/MGrQvmPueyY1y244W457oMCKGcY25KU4oDDmjgVx4J6+YS+BRvLtJa1TR4rk4GfieOVsCBMLjdHC/JHGQFR04hRE4aqEvPnVAgsooxD5dcMSyK81V2IUiKTEhusEBaN+4CCWvlntSvuMIxdtEDaQnGHOaRFeCHXxZGMjjrPT+a/eXepNcxLaTEQ2+hwEdEykSjPRvCsnx60DxsRUn1sM86/ixtdpv2QvRqUKh8fE+ltkxBQL36K8QviDNP6Oj3UCuCDL3+DJqQwlk5RMmg3kaSYHcnJ1z7QH4VbNpMSZsYh3SA+LsTey8KbJb9z954UTCacFBfFsKfrgSJWcSbLU1MF+5EB45WSKZTNk99e9WB+qlDSFPY+DF+V9qwokV1m/AI2xlYr0eSvMfMwd1jUvFCFyqSmfbOI0t2flWQ+UdQSL8yfs69N6uPzk= diff --git a/README.md b/README.md index 90a4c3a..dbdb91f 100644 --- a/README.md +++ b/README.md @@ -109,12 +109,12 @@ jplot --url http://:8080/debug/vars \ ### Vegeta -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: +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: ``` echo 'GET http://localhost:8080' | \ vegeta attack -rate 5000 -workers 100 -duration 10m | vegeta dump | \ - jaggr @count=rps \ + jplot @count=rps \ hist\[100,200,300,400,500\]:code \ p25,p50,p95:latency \ sum:bytes_in \ diff --git a/go.mod b/go.mod index fb3492c..34e9983 100644 --- a/go.mod +++ b/go.mod @@ -1,23 +1,25 @@ module github.com/rs/jplot -go 1.14 +go 1.19 require ( - github.com/davecgh/go-spew v1.1.1 // indirect github.com/dustin/go-humanize v1.0.0 github.com/elgs/gojq v0.0.0-20201120033525-b5293fef2759 - github.com/elgs/gosplitargs v0.0.0-20161028071935-a491c5eeb3c8 // indirect - github.com/kr/pretty v0.1.0 // indirect github.com/mattn/go-isatty v0.0.14 github.com/mattn/go-sixel v0.0.1 github.com/monochromegane/terminal v0.0.0-20161222050454-9bc47e2707d9 - github.com/soniakeys/quant v1.0.0 // indirect - github.com/stretchr/testify v1.7.0 // indirect github.com/wcharczuk/go-chart/v2 v2.1.0 golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 +) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/elgs/gosplitargs v0.0.0-20161028071935-a491c5eeb3c8 // indirect + github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect + github.com/soniakeys/quant v1.0.0 // indirect + github.com/stretchr/testify v1.7.0 // indirect golang.org/x/image v0.0.0-20211028202545-6944b10bf410 // indirect golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect ) diff --git a/go.sum b/go.sum index e74a593..bc887b8 100644 --- a/go.sum +++ b/go.sum @@ -9,11 +9,6 @@ github.com/elgs/gosplitargs v0.0.0-20161028071935-a491c5eeb3c8 h1:bD2/rCXwgXJm2v github.com/elgs/gosplitargs v0.0.0-20161028071935-a491c5eeb3c8/go.mod h1:o4DgpccPNAQAlPSxo7I4L/LWNh2oyr/BBGSynrLTmZM= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -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-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= 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 golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ= golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1 h1:kwrAHlwJ0DUBZwQ238v+Uod/3eZ8B2K5rYsUHBQvzmI= golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=