Navigation Menu

Skip to content

Commit

Permalink
Use -X compile param to set version
Browse files Browse the repository at this point in the history
  • Loading branch information
xthexder authored and Jacob Wirth committed Mar 29, 2016
1 parent d026b34 commit 461b2b7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 12 deletions.
18 changes: 8 additions & 10 deletions Makefile
Expand Up @@ -7,14 +7,15 @@ COMBINED_GOPATH=$(GODEP_PATH):$(ORIGINAL_PATH)


.PHONY: packages deb test linux darwin windows .PHONY: packages deb test linux darwin windows


all: version deb linux darwin windows docker build:
GOPATH=$(COMBINED_GOPATH) go build -ldflags="-X github.com/Shopify/toxiproxy.Version git-`git rev-parse --short HEAD`" -o toxiproxy ./cmd

all: deb linux darwin windows
deb: $(DEB) deb: $(DEB)
darwin: tmp/build/toxiproxy-darwin-amd64 darwin: tmp/build/toxiproxy-darwin-amd64
linux: tmp/build/toxiproxy-linux-amd64 linux: tmp/build/toxiproxy-linux-amd64
windows: tmp/build/toxiproxy-windows-amd64.exe windows: tmp/build/toxiproxy-windows-amd64.exe

release: all docker
build:
GOPATH=$(COMBINED_GOPATH) go build -o toxiproxy ./cmd


clean: clean:
rm tmp/build/* rm tmp/build/*
Expand All @@ -23,17 +24,14 @@ clean:
test: test:
GOMAXPROCS=4 GOPATH=$(COMBINED_GOPATH) go test -v -race ./... GOMAXPROCS=4 GOPATH=$(COMBINED_GOPATH) go test -v -race ./...


version:
sed -i "s/Version = \"[^\"]*\"/Version = \"$(VERSION)\"/" version.go

tmp/build/toxiproxy-linux-amd64: tmp/build/toxiproxy-linux-amd64:
GOOS=linux GOARCH=amd64 GOPATH=$(COMBINED_GOPATH) go build -o $(@) ./cmd GOOS=linux GOARCH=amd64 GOPATH=$(COMBINED_GOPATH) go build -ldflags="-X github.com/Shopify/toxiproxy.Version $(VERSION)" -o $(@) ./cmd


tmp/build/toxiproxy-darwin-amd64: tmp/build/toxiproxy-darwin-amd64:
GOOS=darwin GOARCH=amd64 GOPATH=$(COMBINED_GOPATH) go build -o $(@) ./cmd GOOS=darwin GOARCH=amd64 GOPATH=$(COMBINED_GOPATH) go build -ldflags="-X github.com/Shopify/toxiproxy.Version $(VERSION)" -o $(@) ./cmd


tmp/build/toxiproxy-windows-amd64.exe: tmp/build/toxiproxy-windows-amd64.exe:
GOOS=windows GOARCH=amd64 GOPATH=$(COMBINED_GOPATH) go build -o $(@) ./cmd GOOS=windows GOARCH=amd64 GOPATH=$(COMBINED_GOPATH) go build -ldflags="-X github.com/Shopify/toxiproxy.Version $(VERSION)" -o $(@) ./cmd


docker: docker:
docker build --tag="shopify/toxiproxy:$(VERSION)" . docker build --tag="shopify/toxiproxy:$(VERSION)" .
Expand Down
3 changes: 1 addition & 2 deletions version.go
@@ -1,4 +1,3 @@
package toxiproxy package toxiproxy


//go:generate make version var Version = "git"
var Version = "1.2.1"

0 comments on commit 461b2b7

Please sign in to comment.