Skip to content

Commit

Permalink
Merge pull request #98 from k1LoW/remove-packr
Browse files Browse the repository at this point in the history
packr2 to embed
  • Loading branch information
k1LoW authored Nov 4, 2022
2 parents fc079c1 + ba50f2b commit aeb6858
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 595 deletions.
9 changes: 0 additions & 9 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ before:
builds:
-
id: ndiag-darwin
hooks:
pre: packr2
post: packr2 clean
ldflags:
- -s -w -X github.com/k1LoW/ndiag.version={{.Version}} -X github.com/k1LoW/ndiag.commit={{.FullCommit}} -X github.com/k1LoW/ndiag.date={{.Date}} -X github.com/k1LoW/ndiag/version.Version={{.Version}}
env:
Expand All @@ -18,9 +15,6 @@ builds:
- amd64
-
id: ndiag-darwin-arm64
hooks:
pre: packr2
post: packr2 clean
ldflags:
- -s -w -X github.com/k1LoW/ndiag.version={{.Version}} -X github.com/k1LoW/ndiag.commit={{.FullCommit}} -X github.com/k1LoW/ndiag.date={{.Date}} -X github.com/k1LoW/ndiag/version.Version={{.Version}}
env:
Expand All @@ -31,9 +25,6 @@ builds:
- arm64
-
id: ndiag-linux
hooks:
pre: packr2
post: packr2 clean
flags:
- -a
- -tags
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ lint:
golangci-lint run ./...

build:
packr2
go build -ldflags="$(BUILD_LDFLAGS)"
packr2 clean

ndiag_draw: build
./ndiag draw -c example/3-tier/input/ndiag.yml -n example/3-tier/input/nodes.yml -t png -l consul -l vip_group > example.png
Expand Down Expand Up @@ -62,7 +60,6 @@ ci_doc: depsdev ndiag_doc
depsdev:
go install github.com/Songmu/ghch/cmd/ghch@latest
go install github.com/Songmu/gocredits/cmd/gocredits@latest
go install github.com/gobuffalo/packr/v2/[email protected]

prerelease:
git pull origin main --tag
Expand Down
9 changes: 1 addition & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ go 1.19
require (
github.com/antchfx/xmlquery v1.3.12
github.com/elliotchance/orderedmap v1.5.0
github.com/gobuffalo/packr/v2 v2.8.3
github.com/goccy/go-graphviz v0.0.9
github.com/goccy/go-json v0.9.11
github.com/goccy/go-yaml v1.9.6
Expand All @@ -30,30 +29,24 @@ require (
github.com/beta/freetype v0.0.1 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fogleman/gg v1.3.0 // indirect
github.com/gobuffalo/logger v1.0.7 // indirect
github.com/gobuffalo/packd v1.0.2 // indirect
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/markbates/errx v1.1.0 // indirect
github.com/markbates/oncer v1.0.0 // indirect
github.com/markbates/safe v1.0.1 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/muesli/clusters v0.0.0-20200529215643-2700303c1762 // indirect
github.com/muesli/kmeans v0.3.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/rivo/uniseg v0.4.2 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
github.com/stretchr/testify v1.8.0 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
golang.org/x/image v0.1.0 // indirect
golang.org/x/net v0.1.0 // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/term v0.1.0 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
)
Loading

0 comments on commit aeb6858

Please sign in to comment.