fix(pkg/daemon): save measured values into postgres database if defined
This commit is contained in:
306
Makefile
306
Makefile
@ -5,90 +5,185 @@
|
||||
UID?=$(shell id --user)
|
||||
GID?=$(shell id --group)
|
||||
|
||||
# VERSION
|
||||
IMAGE_VERSION:=$(or ${VERSION}, latest)
|
||||
|
||||
# VERSION/RELEASE
|
||||
# If no version is specified as a parameter of make, the last git hash
|
||||
# value is taken.
|
||||
VERSION:=$(or ${TRAVIS_TAG}, $(shell git rev-parse --short HEAD)-git)
|
||||
VERSION?=$(shell git describe --abbrev=0)+hash.$(shell git rev-parse --short HEAD)
|
||||
RELEASE?=1
|
||||
|
||||
|
||||
# CONTAINER_RUNTIME
|
||||
CONTAINER_RUNTIME?=$(shell which docker)
|
||||
|
||||
# BUILD_IMAGE
|
||||
BUILD_IMAGE:=volkerraschek/build-image:latest
|
||||
|
||||
# GH_USER/GITHUB_TOKEN
|
||||
# It's the user name from github.com and his token. This token and the username
|
||||
# can be set over encrypted environment variables in the ci/cd pipeline
|
||||
GITHUB_USER=volker-raschek
|
||||
GITHUB_TOKEN?=""
|
||||
|
||||
# BUILD_IMAGE
|
||||
BUILD_IMAGE:=volkerraschek/build-image:latest
|
||||
|
||||
# EXECUTABLE
|
||||
# Executable binary which should be compiled for different architecures
|
||||
EXECUTABLE:=flucky
|
||||
|
||||
# UNIX_EXECUTABLES
|
||||
# DARWIN_EXECUTABLES AND TARGETS
|
||||
DARWIN_EXECUTABLES:=\
|
||||
darwin/386/${EXECUTABLE} \
|
||||
darwin/amd64/${EXECUTABLE}
|
||||
|
||||
DARWIN_EXECUTABLE_TARGETS:=${DARWIN_EXECUTABLES:%=bin/%}
|
||||
|
||||
# FREEBSD_EXECUTABLES AND TARGETS
|
||||
FREEBSD_EXECUTABLES:= \
|
||||
freebsd/amd64/${EXECUTABLE}
|
||||
|
||||
FREEBSD_EXECUTABLE_TARGETS:=${FREEBSD_EXECUTABLES:%=bin/%}
|
||||
|
||||
# LINUX_EXECUTABLES AND TARGETS
|
||||
LINUX_EXECUTABLES:= \
|
||||
linux/amd64/${EXECUTABLE} \
|
||||
linux/386/${EXECUTABLE} \
|
||||
linux/arm/5/${EXECUTABLE} \
|
||||
linux/arm/7/${EXECUTABLE}
|
||||
|
||||
LINUX_EXECUTABLE_TARGETS:=${LINUX_EXECUTABLES:%=bin/%}
|
||||
|
||||
# UNIX_EXECUTABLES AND TARGETS
|
||||
# Define all executables for different architectures and operation systems
|
||||
UNIX_EXECUTABLES := \
|
||||
darwin/386/$(EXECUTABLE) \
|
||||
darwin/amd64/$(EXECUTABLE) \
|
||||
freebsd/amd64/$(EXECUTABLE) \
|
||||
linux/386/$(EXECUTABLE) \
|
||||
linux/amd64/$(EXECUTABLE) \
|
||||
linux/arm/5/$(EXECUTABLE) \
|
||||
linux/arm/7/$(EXECUTABLE) \
|
||||
UNIX_EXECUTABLES:= \
|
||||
${DARWIN_EXECUTABLES} \
|
||||
${FREEBSD_EXECUTABLES} \
|
||||
${LINUX_EXECUTABLES}
|
||||
|
||||
UNIX_EXECUTABLE_TARGETS:= \
|
||||
${DARWIN_EXECUTABLE_TARGETS} \
|
||||
${FREEBSD_EXECUTABLE_TARGETS} \
|
||||
${LINUX_EXECUTABLE_TARGETS}
|
||||
|
||||
# EXECUTABLE_TARGETS
|
||||
# Include the relative paths to all executables
|
||||
EXECUTABLE_TARGETS=$(UNIX_EXECUTABLES:%=bin/%)
|
||||
# Include all UNIX and Windows targets.
|
||||
EXECUTABLE_TARGETS:= \
|
||||
${UNIX_EXECUTABLE_TARGETS}
|
||||
|
||||
# COMPRSSED_EXECUTABLES
|
||||
# Append to all defined executables the compression extentions to detect the
|
||||
# different make steps which compress the binary
|
||||
COMPRESSED_EXECUTABLES=$(UNIX_EXECUTABLES:%=%.tar.bz2) $(UNIX_EXECUTABLES:%=%.tar.gz) $(UNIX_EXECUTABLES:%=%.tar.xz)
|
||||
COMPRESSED_EXECUTABLE_TARGETS=$(COMPRESSED_EXECUTABLES:%=bin/%)
|
||||
COMPRESSED_EXECUTABLES:= \
|
||||
${UNIX_EXECUTABLES:%=%.tar.bz2} \
|
||||
${UNIX_EXECUTABLES:%=%.tar.gz} \
|
||||
${UNIX_EXECUTABLES:%=%.tar.xz} \
|
||||
${UNIX_EXECUTABLES:%=%.zip}
|
||||
COMPRESSED_EXECUTABLE_TARGETS:=${COMPRESSED_EXECUTABLES:%=bin/%}
|
||||
|
||||
# PHONY
|
||||
# To avoid a conflict with an existing file and a defined make step
|
||||
.PHONY: clean container/${EXECUTABLE_TARGETS} container/test release remote test
|
||||
# RPM_TARGETS
|
||||
RPM_EXECUTABLES:=${LINUX_EXECUTABLES:%=%.rpm}
|
||||
RPM_EXECUTABLE_TARGETS:=${RPM_EXECUTABLES:%=bin/%}
|
||||
|
||||
$(EXECUTABLE): bindata
|
||||
go build -ldflags "-X main.version=${VERSION}" -o "$@"
|
||||
# RELEASE_TARGETS
|
||||
RELEASE_EXECUTABLES:= \
|
||||
${COMPRESSED_EXECUTABLE_TARGETS} \
|
||||
${RPM_EXECUTABLE_TARGETS}
|
||||
|
||||
RELEASE_EXECUTABLE_TARGETS:= \
|
||||
${COMPRESSED_EXECUTABLE_TARGETS:%=release/%} \
|
||||
${RPM_EXECUTABLE_TARGETS:%=release/%}
|
||||
|
||||
# BINARIES
|
||||
# ==============================================================================
|
||||
# current os
|
||||
${EXECUTABLE}: bindata
|
||||
CGO_ENABLED=0 go build -ldflags "-X main.version=${VERSION}" -o "$@"
|
||||
|
||||
# build all binaries
|
||||
PHONY:=all
|
||||
all: ${EXECUTABLE_TARGETS}
|
||||
|
||||
container/bin/tmp/${EXECUTABLE}:
|
||||
$(MAKE) container-run COMMAND=$(subst container/,,$@)
|
||||
# darwin os
|
||||
bin/darwin/386/${EXECUTABLE}: bindata
|
||||
CGO_ENABLED=0 GOARCH=386 GOOS=darwin go build -ldflags "-X main.version=${VERSION}" -o "$@"
|
||||
|
||||
# 386
|
||||
bin/darwin/386/$(EXECUTABLE): bindata
|
||||
GOARCH=386 GOOS=darwin go build -ldflags "-X main.version=${VERSION}" -o "$@"
|
||||
bin/darwin/amd64/${EXECUTABLE}: bindata
|
||||
CGO_ENABLED=0 GOARCH=amd64 GOOS=darwin go build -ldflags "-X main.version=${VERSION}" -o "$@"
|
||||
|
||||
bin/linux/386/$(EXECUTABLE): bindata
|
||||
GOARCH=386 GOOS=linux go build -ldflags "-X main.version=${VERSION}" -o "$@"
|
||||
# freebsd os
|
||||
bin/freebsd/amd64/${EXECUTABLE}: bindata
|
||||
CGO_ENABLED=0 GOARCH=amd64 GOOS=freebsd go build -ldflags "-X main.version=${VERSION}" -o "$@"
|
||||
|
||||
# amd64
|
||||
bin/freebsd/amd64/$(EXECUTABLE): bindata
|
||||
GOARCH=amd64 GOOS=freebsd go build -ldflags "-X main.version=${VERSION}" -o "$@"
|
||||
# linux os
|
||||
bin/linux/386/${EXECUTABLE}: bindata
|
||||
CGO_ENABLED=0 GOARCH=386 GOOS=linux go build -ldflags "-X main.version=${VERSION}" -o "$@"
|
||||
|
||||
bin/darwin/amd64/$(EXECUTABLE): bindata
|
||||
GOARCH=amd64 GOOS=darwin go build -ldflags "-X main.version=${VERSION}" -o "$@"
|
||||
bin/linux/amd64/${EXECUTABLE}: bindata
|
||||
CGO_ENABLED=0 GOARCH=amd64 GOOS=linux go build -ldflags "-X main.version=${VERSION}" -o "$@"
|
||||
|
||||
bin/linux/amd64/$(EXECUTABLE): bindata
|
||||
GOARCH=amd64 GOOS=linux go build -ldflags "-X main.version=${VERSION}" -o "$@"
|
||||
|
||||
# arm
|
||||
bin/linux/arm/5/${EXECUTABLE}: bindata
|
||||
GOARM=5 GOARCH=arm go build -ldflags "-X main.version=${VERSION}" -o "$@"
|
||||
CGO_ENABLED=0 GOARM=5 GOARCH=arm GOOS=linux go build -ldflags "-X main.version=${VERSION}" -o "$@"
|
||||
|
||||
bin/linux/arm/7/${EXECUTABLE}: bindata
|
||||
GOARM=7 GOARCH=arm go build -ldflags "-X main.version=${VERSION}" -o "$@"
|
||||
|
||||
CGO_ENABLED=0 GOARM=7 GOARCH=arm GOOS=linux go build -ldflags "-X main.version=${VERSION}" -o "$@"
|
||||
|
||||
# GO-BINDATA
|
||||
# ==============================================================================
|
||||
bindata:
|
||||
go-bindata -pkg db -o ./pkg/db/bindataSQL.go ./pkg/db/sql/***
|
||||
go-bindata -pkg goldenfiles -o ./test/goldenfiles/bindata.go ./test/goldenfiles/json/***
|
||||
go-bindata -pkg db -o ./pkg/storage/db/bindataSQL.go ./pkg/storage/db/sql/*** ./pkg/storage/db/sql/psql/schema/***
|
||||
go-bindata -pkg goldenfiles -o ./test/goldenfiles/bindata.go ./test/goldenfiles/json
|
||||
|
||||
# TEST
|
||||
# ==============================================================================
|
||||
PHONY+=test test-update-all
|
||||
test: ${EXECUTABLE}
|
||||
go test -v ./...
|
||||
|
||||
test-update-all: ${EXECUTABLE}
|
||||
go test -v ./pkg/... -update all
|
||||
|
||||
# PACKAGES
|
||||
# ==============================================================================
|
||||
%.rpm: %
|
||||
rpm-builder \
|
||||
--exec-file "$<:/usr/bin/${EXECUTABLE}" \
|
||||
--dir "systemd:/usr/lib/systemd/system" \
|
||||
--license AGFA_PROPERTERY \
|
||||
--version ${VERSION} \
|
||||
--release ${RELEASE} \
|
||||
--out $@ \
|
||||
${EXECUTABLE}
|
||||
|
||||
# RELEASE
|
||||
# ==============================================================================
|
||||
PHONY+=release/all
|
||||
release/all: clean ${RELEASE_EXECUTABLES}
|
||||
|
||||
github-release release \
|
||||
--user ${GITHUB_USER} \
|
||||
--repo ${EXECUTABLE} \
|
||||
--tag ${VERSION}
|
||||
|
||||
$(foreach FILE,${RELEASE_EXECUTABLES},github-release upload --user ${GITHUB_USER} --repo ${EXECUTABLE} --tag ${VERSION} --name $(subst /,-,${FILE}) --file bin/${FILE} --replace;)
|
||||
|
||||
PHONY+=${RELEASE_EXECUTABLE_TARGETS}
|
||||
${RELEASE_EXECUTABLE_TARGETS}: clean
|
||||
$(MAKE) $(subst release/,,$@)
|
||||
|
||||
github-release release \
|
||||
--user ${GITHUB_USER} \
|
||||
--repo ${EXECUTABLE} \
|
||||
--tag ${VERSION}
|
||||
|
||||
github-release upload \
|
||||
--user ${GITHUB_USER} \
|
||||
--repo ${EXECUTABLE} \
|
||||
--tag ${VERSION} \
|
||||
--name $(subst /,-,$(subst release/bin/,,$@)) \
|
||||
--file $(subst release/,,$@) \
|
||||
--replace
|
||||
|
||||
# COMPRESSION
|
||||
# ==============================================================================
|
||||
%.tar.bz2: %
|
||||
tar --create --bzip2 --file "$@" "$<"
|
||||
|
||||
@ -98,66 +193,88 @@ bindata:
|
||||
%.tar.xz: %
|
||||
tar --create --xz --file "$@" "$<"
|
||||
|
||||
%.zip: %
|
||||
zip "$@" "$<"
|
||||
|
||||
test: ${EXECUTABLE}
|
||||
go test -v ./pkg/...
|
||||
|
||||
release: clean
|
||||
$(MAKE) $(COMPRESSED_EXECUTABLE_TARGETS)
|
||||
github-release release \
|
||||
--user ${GITHUB_USER} \
|
||||
--repo ${EXECUTABLE} \
|
||||
--tag ${VERSION}
|
||||
|
||||
$(foreach FILE,$(COMPRESSED_EXECUTABLES),github-release upload --user ${GITHUB_USER} --repo ${EXECUTABLE} --tag ${VERSION} --name $(subst /,-,$(FILE)) --file bin/$(FILE) --replace;)
|
||||
|
||||
|
||||
# OTHER STUFF
|
||||
# ==============================================================================
|
||||
PHONY+=clean
|
||||
clean:
|
||||
rm ${EXECUTABLE} || true
|
||||
rm ${EXECUTABLE}.* || true
|
||||
rm --recursive --force bin/ || true
|
||||
|
||||
|
||||
# CONTAINER IMAGE STEPS
|
||||
# ==============================================================================
|
||||
PHONY+=container-image/build/amd64
|
||||
container-image/build/amd64: bin/linux/amd64/${EXECUTABLE}
|
||||
${CONTAINER_RUNTIME} build \
|
||||
--tag volkerraschek/${EXECUTABLE}:${IMAGE_VERSION} \
|
||||
.
|
||||
|
||||
PHONY+=container-image/push/amd64
|
||||
container-image/push/amd64: container-image/build/amd64
|
||||
${CONTAINER_RUNTIME} push volkerraschek/${EXECUTABLE}:${IMAGE_VERSION}
|
||||
|
||||
# container
|
||||
container/${EXECUTABLE}:
|
||||
$(MAKE) container-run COMMAND=$(subst container/,,$@)
|
||||
# CONTAINER STEPS - BINARY
|
||||
# ==============================================================================
|
||||
# current os
|
||||
PHONY+=container-run/${EXECUTABLE}
|
||||
container-run/${EXECUTABLE}:
|
||||
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
|
||||
|
||||
container/all:
|
||||
$(MAKE) container-run COMMAND=$(subst container/,,$@)
|
||||
# build all binaries for any operating system
|
||||
PHONY+=container-run/all
|
||||
container-run/all:
|
||||
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
|
||||
|
||||
container/test:
|
||||
$(MAKE) container-run COMMAND=$(subst container/,,$@)
|
||||
PHONY+=${UNIX_EXECUTABLE_TARGETS:%=container-run/%}
|
||||
${UNIX_EXECUTABLE_TARGETS:%=container-run/%}:
|
||||
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
|
||||
|
||||
container/release:
|
||||
$(MAKE) container-run COMMAND=$(subst container/,,$@)
|
||||
# CONTAINER STEPS - GO-BINDATA
|
||||
# ==============================================================================
|
||||
PHONY+=container-run/bindata
|
||||
container-run/bindata:
|
||||
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
|
||||
|
||||
# container - 386
|
||||
container/bin/darwin/386/$(EXECUTABLE):
|
||||
$(MAKE) container-run COMMAND=$(subst container/,,$@)
|
||||
# CONTAINER STEPS - TEST
|
||||
# ==============================================================================
|
||||
PHONY+=container-run/test
|
||||
container-run/test:
|
||||
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
|
||||
|
||||
container/bin/linux/386/$(EXECUTABLE):
|
||||
$(MAKE) container-run COMMAND=$(subst container/,,$@)
|
||||
PHONY+=container-run/test-update-all
|
||||
container-run/test-update-all:
|
||||
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
|
||||
|
||||
# container - amd
|
||||
container/bin/freebsd/amd64/$(EXECUTABLE):
|
||||
$(MAKE) container-run COMMAND=$(subst container/,,$@)
|
||||
# CONTAINER STEPS - COMPRESSED BINARIES AND PACKAGES
|
||||
# ==============================================================================
|
||||
PHONY+=${COMPRESSED_EXECUTABLE_TARGETS:%=container-run/%}
|
||||
${COMPRESSED_EXECUTABLE_TARGETS:%=container-run/%}:
|
||||
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
|
||||
|
||||
container/bin/darwin/amd64/$(EXECUTABLE):
|
||||
$(MAKE) container-run COMMAND=$(subst container/,,$@)
|
||||
PHONY+=${RPM_EXECUTABLE_TARGETS:%=container-run/%}
|
||||
${RPM_EXECUTABLE_TARGETS:%=container-run/%}:
|
||||
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
|
||||
|
||||
container/bin/linux/amd64/$(EXECUTABLE):
|
||||
$(MAKE) container-run COMMAND=$(subst container/,,$@)
|
||||
# CONTAINER STEPS - RELEASE COMPRESSED BINARIES AND PACKAGES
|
||||
# ==============================================================================
|
||||
PHONY+=${RELEASE_EXECUTABLE_TARGETS%=container-run/%}
|
||||
${RELEASE_EXECUTABLE_TARGETS:%=container-run/%}:
|
||||
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
|
||||
|
||||
# container - arm
|
||||
container/bin/linux/arm/7/${EXECUTABLE}:
|
||||
$(MAKE) container-run COMMAND=$(subst container/,,$@)
|
||||
# CONTAINER STEPS - OTHER STUF
|
||||
# ==============================================================================
|
||||
PHONY+=container-run/clean
|
||||
container-run/clean:
|
||||
$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
|
||||
|
||||
container/bin/linux/arm/5/${EXECUTABLE}:
|
||||
$(MAKE) container-run COMMAND=$(subst container/,,$@)
|
||||
|
||||
|
||||
container-run:
|
||||
# GENERAL CONTAINER COMMAND
|
||||
# ==============================================================================
|
||||
PHONY+=container-run/
|
||||
container-run/:
|
||||
${CONTAINER_RUNTIME} run \
|
||||
--rm \
|
||||
--volume ${PWD}:/workspace \
|
||||
@ -166,8 +283,17 @@ container-run:
|
||||
UID=${UID} \
|
||||
GID=${GID} \
|
||||
VERSION=${VERSION} \
|
||||
GITHUB_TOKEN=${GITHUB_TOKEN}
|
||||
RELEASE=${RELEASE}
|
||||
|
||||
remote: bin/linux/arm/7/${EXECUTABLE}
|
||||
scp bin/linux/arm/7/${EXECUTABLE} ${FLUCKY_REMOTE}:/usr/local/bin
|
||||
ssh ${FLUCKY_REMOTE} "chmod +x /usr/local/bin/flucky"
|
||||
# REMOTE
|
||||
# ==============================================================================
|
||||
PHONY+=${FLUCKY_REMOTE:%=remote/%}
|
||||
remote/${FLUCKY_REMOTE}: bin/linux/arm/7/${EXECUTABLE}
|
||||
scp bin/linux/arm/7/${EXECUTABLE} root@${FLUCKY_REMOTE}:/usr/local/bin/${EXECUTABLE}
|
||||
ssh root@${FLUCKY_REMOTE} 'chmod +x /usr/local/bin/${EXECUTABLE}'
|
||||
|
||||
# PHONY
|
||||
# ==============================================================================
|
||||
# Declare the contents of the PHONY variable as phony. We keep that information
|
||||
# in a variable so we can use it in if_changed.
|
||||
.PHONY: ${PHONY}
|
Reference in New Issue
Block a user