From 86d7c05c6b0c21a55c5e41246e46d5079acc5157 Mon Sep 17 00:00:00 2001 From: Trevor Pounds Date: Wed, 25 Sep 2019 10:26:46 -0400 Subject: [PATCH] Build godownloader/goreleaser tools before use. (#744) --- .gitignore | 2 ++ Makefile | 22 +++++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 16e7077e..292a5800 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ /test/path /golangci-lint /tools/Dracula.itermcolors +/tools/godownloader +/tools/goreleaser /tools/node_modules /tools/svg-term /.vscode/ diff --git a/Makefile b/Makefile index 1cf2a6bb..fcaeb214 100644 --- a/Makefile +++ b/Makefile @@ -18,8 +18,10 @@ build: golangci-lint clean: rm -f golangci-lint rm -f test/path - rm -f tools/svg-term rm -f tools/Dracula.itermcolors + rm -f tools/godownloader + rm -f tools/goreleaser + rm -f tools/svg-term rm -rf tools/node_modules .PHONY: fast_build build build_race clean @@ -63,9 +65,8 @@ fast_check_generated: git diff --exit-code # check no changes .PHONY: fast_check_generated -release: export GOFLAGS = -mod=readonly -release: .goreleaser.yml - cd tools && go run github.com/goreleaser/goreleaser --config ../.goreleaser.yml +release: .goreleaser.yml tools/goreleaser + ./tools/goreleaser .PHONY: release # Non-PHONY targets (real files) @@ -73,6 +74,14 @@ release: .goreleaser.yml golangci-lint: FORCE go build -o $@ ./cmd/golangci-lint +tools/godownloader: export GOFLAGS = -mod=readonly +tools/godownloader: tools/go.mod tools/go.sum + cd tools && go build github.com/goreleaser/godownloader + +tools/goreleaser: export GOFLAGS = -mod=readonly +tools/goreleaser: tools/go.mod tools/go.sum + cd tools && go build github.com/goreleaser/goreleaser + tools/svg-term: tools/package.json tools/package-lock.json cd tools && npm ci ln -sf node_modules/.bin/svg-term $@ @@ -83,9 +92,8 @@ tools/Dracula.itermcolors: docs/demo.svg: tools/svg-term tools/Dracula.itermcolors ./tools/svg-term --cast=183662 --out docs/demo.svg --window --width 110 --height 30 --from 2000 --to 20000 --profile ./tools/Dracula.itermcolors --term iterm2 -install.sh: export GOFLAGS = -mod=readonly -install.sh: .goreleaser.yml - cd tools && go run github.com/goreleaser/godownloader ../.goreleaser.yml | sed '/DO NOT EDIT/s/ on [0-9TZ:-]*//' > ../$@ +install.sh: .goreleaser.yml tools/godownloader + ./tools/godownloader .goreleaser.yml | sed '/DO NOT EDIT/s/ on [0-9TZ:-]*//' > $@ README.md: FORCE golangci-lint go run ./scripts/gen_readme/main.go