(0.3.5) Automated packaging of release by Packagr

Signed-off-by: Jason Kulatunga <jason@thesparktree.com>
fixing buildd typo.
2020-11-06 04:38:37 +00:00 · 2020-11-05 08:34:57 -08:00 · 2020-11-05 16:12:37 +00:00 · 2020-11-05 08:03:20 -08:00 · 2020-11-05 07:54:54 -08:00 · 2020-11-05 07:47:43 -08:00
4 changed files with 23 additions and 12 deletions
@@ -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
-          cp -a $GITHUB_WORKSPACE/* $PROJECT_PATH/
+          mkdir -p $(dirname "$PROJECT_PATH")
+          cp -a $GITHUB_WORKSPACE $PROJECT_PATH
          cd $PROJECT_PATH

          go mod vendor
@@ -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
-          cp -a $GITHUB_WORKSPACE/* $PROJECT_PATH/
+          mkdir -p $(dirname "$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

@@ -151,7 +156,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-6
+          asset_path: /build/scrutiny-collector-metrics-linux-arm-6
          asset_name: scrutiny-collector-metrics-linux-arm-6
          asset_content_type: application/octet-stream

@@ -172,7 +177,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-7
+          asset_path: /build/scrutiny-collector-metrics-linux-arm-7
          asset_name: scrutiny-collector-metrics-linux-arm-7
          asset_content_type: application/octet-stream

@@ -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
@@ -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.5"
Author	SHA1	Message	Date
Jason Kulatunga	27b923b5e9	(0.3.5) Automated packaging of release by Packagr Signed-off-by: Jason Kulatunga <jason@thesparktree.com>	2020-11-06 04:38:37 +00:00
Jason Kulatunga	698cb404cf	fixing buildd typo.	2020-11-05 08:34:57 -08:00
Jason Kulatunga	bab25de2f2	(0.3.4) Automated packaging of release by Packagr Signed-off-by: Jason Kulatunga <jason@thesparktree.com>	2020-11-05 16:12:37 +00:00
Jason Kulatunga	520136a5ec	fixing automated version bump, attempt 3.	2020-11-05 08:03:20 -08:00
Jason Kulatunga	7fb717270f	guess and check.	2020-11-05 07:54:54 -08:00
Jason Kulatunga	14ed3eb71e	fixing release.	2020-11-05 07:47:43 -08:00
Jason Kulatunga	e364fe95d9	fixing verion bump for release.	2020-11-05 07:25:44 -08:00
Jason Kulatunga	c285491c34	update git.	2020-11-05 07:23:52 -08:00
Jason Kulatunga	c62af772af	update git.	2020-11-04 09:06:48 -08:00
Jason Kulatunga	fe5bad8c00	update git.	2020-11-04 08:56:00 -08:00
Jason Kulatunga	72e0681497	update git.	2020-11-04 08:46:17 -08:00
Jason Kulatunga	885a957197	logging.	2020-11-04 08:37:18 -08:00
Jason Kulatunga	bc444918da	fixing paths using env var, make directory.	2020-11-04 08:08:47 -08:00
Jason Kulatunga	1fe56136b9	fixing paths using env var v2.	2020-11-04 08:03:00 -08:00
Jason Kulatunga	491b1ed4aa	fixing paths using env var	2020-11-04 07:56:31 -08:00
Jason Kulatunga	36f53198be	fixing paths	2020-11-04 07:51:57 -08:00
Jason Kulatunga	85dde0efc9	fixing paths	2020-11-04 07:46:22 -08:00
Jason Kulatunga	bf98216e0d	using GITHUB_WORKSPACE instead of PROJECT_PATH.	2020-11-04 07:34:36 -08:00