add win64 build in and refactor taskfile

umbynos · umbynos · commit 03fd1a8c1f16 · 2020-12-15T11:37:45.000+01:00
Still to handle: TEST_TAG in test.yml and win binary name in release.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -59,19 +59,28 @@ jobs:
         if: matrix.operating-system == 'ubuntu-18.04'
 
         # the manifest is required by windows GUI apps, otherwise the binary will crash with: "Unable to create main window: TTM_ADDTOOL failed" (for reference https://github.com/lxn/walk/issues/28)
-        # rsrc will produce *.syso files that should get automatically recognized by go build command and linked into an executable.
-      - name: Embed manifest in win binary
+        # rsrc will produce a *.syso file that should get automatically recognized by go build command and linked into an executable.
+      - name: Download tool to embed manifest in win binary
         run: |
           go get github.com/akavel/rsrc
-          rsrc -arch 386 -manifest manifest.xml
         if: matrix.operating-system == 'windows-2019'
 
         # building the agent for win requires a different task because of an extra flag
       - name: Build the Agent for win32
         env:
           GOARCH: 386  # 32bit architecture (for support)
           GO386: 387  # support old instruction sets without MMX (used in the Pentium 4) (will be deprecated in GO > 1.15 https://golang.org/doc/go1.15)
-        run: task build-win32
+        run: |
+          rsrc -arch 386 -manifest manifest.xml
+          task build-win
+          rm *.syso
+        if: matrix.operating-system == 'windows-2019'
+
+      - name: Build the Agent for win64
+        run: |
+          rsrc -arch amd64 -manifest manifest.xml
+          task build-win
+          rm *.syso
         if: matrix.operating-system == 'windows-2019'
 
       - name: Build the Agent for macos
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -5,17 +5,17 @@ tasks:
   build:
     desc: Build the project
     cmds:
-      - go build -v -i {{.LDFLAGS}}
+      - go build -v -i -o {{.APP_NAME}} {{.LDFLAGS}}
 
   build-cli:
     desc: Build the project without tray support
     cmds:
       - go build -v -i -tags cli -o {{.APP_NAME}}_cli {{.LDFLAGS}}
 
-  build-win32:
-    desc: Build the project for win 32 bit
+  build-win:
+    desc: Build the project for win
     cmds:
-      - go build -v -i {{.WIN_LDFLAGS}}
+      - go build -v -i -o {{.APP_NAME}}_{{.GOARCH}} {{.WIN_LDFLAGS}}
 
   test:
     desc: Run the full testsuite, `legacy` will be skipped
@@ -50,25 +50,30 @@ vars:
     sh: echo `go list ./... | grep -v 'arduino-create-agent/gen/' | tr '\n' ' '`
   # build vars
   APP_NAME: arduino-create-agent
+  GOARCH:
+    sh: go env GOARCH
   WIN_FLAGS: -H=windowsgui
   COMMIT:
     sh: echo ${TRAVIS_COMMIT:-`git log -n 1 --format=%h`}
+  TEST_COMMIT: "deadbeef"
   TAG:
     sh: echo `git describe --tags --abbrev=0`
+  TEST_TAG: "0.0.0-dev"
   LDFLAGS: >
     -ldflags '-X main.version={{.TAG}}
     -X main.git_revision={{.COMMIT}}'
   WIN_LDFLAGS: >
     -ldflags '-X main.version={{.TAG}}
     -X main.git_revision={{.COMMIT}}
     {{.WIN_FLAGS}}'
-  # test vars
-  GOFLAGS: "-timeout 10m -v -coverpkg=./... -covermode=atomic"
-  TEST_VERSIONSTRING: "0.0.0-alpha"
-  TEST_COMMIT: "deadbeef"
   TEST_LDFLAGS: >
-    -ldflags '-X main.version={{.TEST_VERSIONSTRING}}
+    -ldflags '-X main.version={{.TEST_TAG}}
     -X main.git_revision={{.TEST_COMMIT}}'
+  TEST_TEST_LDFLAGS: >
+    -ldflags '-X main.version={{.TEST_TAG}}
+    -X main.git_revision={{.TEST_COMMIT}}'
+
+  GOFLAGS: "-timeout 10m -v -coverpkg=./... -covermode=atomic"
   # check-lint vars
   GOLINTBIN:
     sh: go list -f {{"{{"}}".Target{{"}}"}}" golang.org/x/lint/golint
