From 5102efe29e071921cdfabc6720741e31850246b9 Mon Sep 17 00:00:00 2001 From: Marvin Steadfast Date: Fri, 17 Apr 2020 13:19:26 +0200 Subject: [PATCH] more archs and fixes version --- .drone.yml | 14 +++++++++++++- .gitignore | 5 +++++ Makefile | 2 +- cmd/jitsiexporter/main.go | 3 ++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4ba7c44..0c72fff 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,22 +2,27 @@ kind: pipeline name: default type: docker + steps: + - name: lint image: golangci/golangci-lint:v1.24-alpine commands: - apk add --no-cache make - make lint + - name: test image: golang:1.14 commands: - make test + - name: build image: golang:1.14 commands: - (cd /go; go get -v github.com/mitchellh/gox) - (cd /go; go get -v github.com/vektra/mockery/.../) - make build + - name: docker image: plugins/docker settings: @@ -28,11 +33,18 @@ steps: from_secret: username password: from_secret: password + - name: publish to github image: plugins/github-release settings: api_key: from_secret: github_token - files: jitsiexporter_linux_amd64 + files: + - jitsiexporter_darwin_* + - jitsiexporter_freebsd_* + - jitsiexporter_linux_* + - jitsiexporter_netbsd_* + - jitsiexporter_openbsd_* + - jitsiexporter_windows_* when: event: tag diff --git a/.gitignore b/.gitignore index b366945..ab0050c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,6 @@ +jitsiexporter_darwin_* +jitsiexporter_freebsd_* jitsiexporter_linux_* +jitsiexporter_netbsd_* +jitsiexporter_openbsd_* +jitsiexporter_windows_* diff --git a/Makefile b/Makefile index 638d01c..bd5b69a 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ VERSION ?= $(shell git describe --tags --always --dirty --match=v* 2> /dev/null build: export GOFLAGS=-mod=vendor ; \ go generate ./...; \ - CGO_ENABLED=0 gox -osarch="linux/amd64" -mod vendor -ldflags '-extldflags "-static" -X "main.version=${VERSION}"' github.com/xsteadfastx/jitsiexporter/cmd/jitsiexporter + CGO_ENABLED=0 gox -mod vendor -ldflags '-extldflags "-static" -X "main.version=${VERSION}"' github.com/xsteadfastx/jitsiexporter/cmd/jitsiexporter clean: rm -f jitsiexporter diff --git a/cmd/jitsiexporter/main.go b/cmd/jitsiexporter/main.go index 246c7d5..dbf7e0d 100644 --- a/cmd/jitsiexporter/main.go +++ b/cmd/jitsiexporter/main.go @@ -10,8 +10,9 @@ import ( "github.com/xsteadfastx/jitsiexporter" ) +var version string = "development" + func main() { - version := "development" ver := flag.Bool("version", false, "Prints version.") url := flag.String("url", "", "URL of Jitsi Videobridge Colibri Stats.") debug := flag.Bool("debug", false, "Enable debug.")