CI fix: Go version bump, release artifacts include fix

dfinance · Jul 2, 2021 · 827b193 · 827b193
1 parent 9d5c093
commit 827b193
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -22,7 +22,7 @@ jobs:
       fail-fast: true
       matrix:
         go:
-          - 1.15.12
+          - 1.15.13
         os:
           - ubuntu-latest
 
@@ -46,17 +46,23 @@ jobs:
   release-build:
     name: Release Build
     runs-on: ubuntu-latest
+    env:
+      GOPATH: /home/runner/work/dstation/dstation
+      working-directory: src/github.com/${{ github.repository }}
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
       - name: Install Go toolchain
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15.12
+          go-version: 1.15.13
+
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          path: ${{ env.working-directory }}
 
       - name: Binaries crossbuild
+        working-directory: ${{ env.working-directory }}
         run: |
           make build-binaries
 
@@ -66,7 +72,7 @@ jobs:
         with:
           draft: true
           files: |
-            .builds/dstation-*
+            ${{ env.GOPATH }}/${{ env.working-directory }}/builds/dstation-*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/Makefile b/Makefile
@@ -116,4 +116,4 @@ build-binaries: go.sum
 	@echo "  TM version:  $(tm_version)"
 	@mkdir -p ./builds
 	@go get github.com/crazy-max/xgo
-	xgo -go 1.15.11 --ldflags='$(ldflags)' --tags='$(build_tags)' --out='./builds/dstation-${app_version}' -targets='windows/amd64,linux/amd64,darwin/amd64' ./cmd/dstation
+	xgo -go='1.15.13' --ldflags='$(ldflags)' --tags='$(build_tags)' --out='./builds/dstation-${app_version}' -targets='windows/amd64,linux/amd64,darwin/amd64' ./cmd/dstation