(0.3.4) Automated packaging of release by Packagr

Signed-off-by: Jason Kulatunga <jason@thesparktree.com>

.github/workflows/build.yaml

@@ -11,12 +11,17 @@ jobs:
       PROJECT_PATH: /go/src/github.com/analogj/scrutiny
       CGO_ENABLED: 1
     steps:
+      - name: Git
+        run: |
+          apt-get update && apt-get install -y software-properties-common
+          add-apt-repository ppa:git-core/ppa && apt-get update && apt-get install -y git
+          git --version
       - name: Checkout
         uses: actions/checkout@v2
       - name: Test
         run: |
-          mkdir -p $PROJECT_PATH
+          mkdir -p $(dirname "$PROJECT_PATH")
-          cp -a $GITHUB_WORKSPACE/* $PROJECT_PATH/
+          cp -a $GITHUB_WORKSPACE $PROJECT_PATH
           cd $PROJECT_PATH
 
           go mod vendor

.github/workflows/release.yaml

@@ -21,6 +21,11 @@ jobs:
       PROJECT_PATH: /go/src/github.com/analogj/scrutiny
       CGO_ENABLED: 1
     steps:
+      - name: Git
+        run: |
+          apt-get update && apt-get install -y software-properties-common
+          add-apt-repository ppa:git-core/ppa && apt-get update && apt-get install -y git
+          git --version
       - name: Checkout
         uses: actions/checkout@v2
       - name: Bump version
@@ -32,8 +37,8 @@ jobs:
           github_token: ${{ secrets.SCRUTINY_GITHUB_TOKEN }}
       - name: Test
         run: |
-          mkdir -p $PROJECT_PATH
+          mkdir -p $(dirname "$PROJECT_PATH")
-          cp -a $GITHUB_WORKSPACE/* $PROJECT_PATH/
+          cp -a $GITHUB_WORKSPACE $PROJECT_PATH
           cd $PROJECT_PATH
 
           go mod vendor
@@ -130,7 +135,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.SCRUTINY_GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: /buildd/scrutiny-collector-metrics-linux-arm-5
+          asset_path: /build/scrutiny-collector-metrics-linux-arm-5
           asset_name: scrutiny-collector-metrics-linux-arm-5
           asset_content_type: application/octet-stream
 

Makefile

@@ -1,5 +1,6 @@
 export CGO_ENABLED = 1
 
+GO_WORKSPACE ?= /go/src/github.com/analogj/scrutiny
 
 BINARY=\
   linux/amd64   \
@@ -16,14 +17,14 @@ $(BINARY): OS = $(word 1,$(subst /, ,$*))
 $(BINARY): ARCH = $(word 2,$(subst /, ,$*))
 $(BINARY): build/scrutiny-web-%:
 	@echo "building web binary (OS = $(OS), ARCH = $(ARCH))"
-	xgo -v --targets="$(OS)/$(ARCH)" -ldflags "-extldflags=-static -X main.goos=$(OS) -X main.goarch=$(ARCH)" -out scrutiny-web -tags "static netgo sqlite_omit_load_extension" ./webapp/backend/cmd/scrutiny/
+	xgo -v --targets="$(OS)/$(ARCH)" -ldflags "-extldflags=-static -X main.goos=$(OS) -X main.goarch=$(ARCH)" -out scrutiny-web -tags "static netgo sqlite_omit_load_extension" ${GO_WORKSPACE}/webapp/backend/cmd/scrutiny/
 
 	chmod +x "/build/scrutiny-web-$(OS)-$(ARCH)"
 	file "/build/scrutiny-web-$(OS)-$(ARCH)" || true
 	ldd "/build/scrutiny-web-$(OS)-$(ARCH)" || true
 
 	@echo "building collector binary (OS = $(OS), ARCH = $(ARCH))"
-	xgo -v --targets="$(OS)/$(ARCH)" -ldflags "-extldflags=-static -X main.goos=$(OS) -X main.goarch=$(ARCH)" -out scrutiny-collector-metrics -tags "static netgo" ./collector/cmd/collector-metrics/
+	xgo -v --targets="$(OS)/$(ARCH)" -ldflags "-extldflags=-static -X main.goos=$(OS) -X main.goarch=$(ARCH)" -out scrutiny-collector-metrics -tags "static netgo" ${GO_WORKSPACE}/collector/cmd/collector-metrics/
 
 	chmod +x "/build/scrutiny-collector-metrics-$(OS)-$(ARCH)"
 	file "/build/scrutiny-collector-metrics-$(OS)-$(ARCH)" || true
@@ -33,10 +34,10 @@ windows/amd64: export OS = windows
 windows/amd64: export ARCH = amd64
 windows/amd64:
 	@echo "building web binary (OS = $(OS), ARCH = $(ARCH))"
-	xgo -v --targets="$(OS)/$(ARCH)" -ldflags "-extldflags=-static -X main.goos=$(OS) -X main.goarch=$(ARCH)" -out scrutiny-web -tags "static netgo sqlite_omit_load_extension" ./webapp/backend/cmd/scrutiny/
+	xgo -v --targets="$(OS)/$(ARCH)" -ldflags "-extldflags=-static -X main.goos=$(OS) -X main.goarch=$(ARCH)" -out scrutiny-web -tags "static netgo sqlite_omit_load_extension" ${GO_WORKSPACE}/webapp/backend/cmd/scrutiny/
 
 	@echo "building collector binary (OS = $(OS), ARCH = $(ARCH))"
-	xgo -v --targets="$(OS)/$(ARCH)" -ldflags "-extldflags=-static -X main.goos=$(OS) -X main.goarch=$(ARCH)" -out scrutiny-collector-metrics -tags "static netgo" ./collector/cmd/collector-metrics/
+	xgo -v --targets="$(OS)/$(ARCH)" -ldflags "-extldflags=-static -X main.goos=$(OS) -X main.goarch=$(ARCH)" -out scrutiny-collector-metrics -tags "static netgo" ${GO_WORKSPACE}/collector/cmd/collector-metrics/
 
 freebsd/amd64: export GOOS = freebsd
 freebsd/amd64: export GOARCH = amd64

webapp/backend/pkg/version/version.go

@@ -2,4 +2,4 @@ package version
 
 // VERSION is the app-global version string, which will be replaced with a
 // new value during packaging
-const VERSION = "0.3.1"
+const VERSION = "0.3.4"