Compare commits

..

No commits in common. "main" and "1.0.0" have entirely different histories.
main ... 1.0.0

2 changed files with 1 additions and 9 deletions

1
.gitignore vendored
View file

@ -1,5 +1,4 @@
bin bin
releases
collerd.db collerd.db
!docker/collerd.json !docker/collerd.json
collerd.json collerd.json

View file

@ -1,8 +1,6 @@
APPVERSION := $(shell cat ./VERSION) APPVERSION := $(shell cat ./VERSION)
GOVERSION := $(shell go version | awk '{print $$3}') GOVERSION := $(shell go version | awk '{print $$3}')
GITCOMMIT := $(shell git log -1 --oneline | awk '{print $$1}') GITCOMMIT := $(shell git log -1 --oneline | awk '{print $$1}')
OS := $(shell uname -s | tr [A-Z] [a-z])
ARCH := $(shell uname -m | tr [A-Z] [a-z])
LDFLAGS = -X main.AppVersion=${APPVERSION} -X main.GoVersion=${GOVERSION} -X main.GitCommit=${GITCOMMIT} LDFLAGS = -X main.AppVersion=${APPVERSION} -X main.GoVersion=${GOVERSION} -X main.GitCommit=${GITCOMMIT}
.PHONY: clean test .PHONY: clean test
@ -14,11 +12,6 @@ build:
&& go build -ldflags "${LDFLAGS}" -o ../bin/coller cmd/coller/main.go \ && go build -ldflags "${LDFLAGS}" -o ../bin/coller cmd/coller/main.go \
) )
archive:
(mkdir -p releases && cd bin && tar cvzpf ../releases/coller-${APPVERSION}-${OS}-${ARCH}.tar.gz * && cd ../releases && sha256sum *.tar.gz)
release: build archive
test: test:
(cd src \ (cd src \
&& go test internal/*.go \ && go test internal/*.go \
@ -26,4 +19,4 @@ test:
) )
clean: clean:
rm -rf bin releases rm -rf bin