Troubleshoot CI build

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8bd72d5779d81a1222c3f3488950992f38f38b3c..e3e254aa8d09cc6107dacb384346cadc7ffd9ca6 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,38 +37,33 @@ jobs:
       - run:
           name: cross compile
           command: |
-            mkdir dist
+            make build-win-amd64-client
+
             mkdir dist/mobius_server_linux_amd64
             mkdir dist/mobius_server_darwin_amd64
             mkdir dist/mobius_server_linux_arm
-            mkdir dist/mobius_server_windows_amd64
 
             cd cmd/mobius-hotline-server
 
             cp -r mobius/config ../../dist/mobius_server_linux_amd64/config
             cp -r mobius/config ../../dist/mobius_server_darwin_amd64/config
             cp -r mobius/config ../../dist/mobius_server_linux_arm/config
-            cp -r mobius/config ../../dist/mobius_server_windows_amd64/config
 
             gox -os="linux" -arch="amd64" -output="../../dist/mobius_server_linux_amd64/mobius_server"
             gox -os="darwin" -arch="amd64" -output="../../dist/mobius_server_darwin_amd64/mobius_server"
             gox -os="linux" -arch="arm" -output="../../dist/mobius_server_linux_arm/mobius_server"
-            GOOS=windows GOARCH=amd64 go build -o ../../dist/mobius_server_windows_amd64/mobius_server"
 
             cd ../mobius-hotline-client
             gox -os="linux" -arch="amd64" -output="../../dist/mobius_client_linux_amd64/mobius_client"
             gox -os="darwin" -arch="amd64" -output="../../dist/mobius_client_darwin_amd64/mobius_client"
-            GOOS=windows GOARCH=amd64 go build -o ../../dist/mobius_client_windows_amd64/mobius_client"
 
             cd ../../dist
             tar -zcvf mobius_server_linux_amd64.tar.gz mobius_server_linux_amd64
             tar -zcvf mobius_server_darwin_amd64.tar.gz mobius_server_darwin_amd64
             tar -zcvf mobius_server_linux_arm.tar.gz mobius_server_linux_arm
-            tar -zcvf mobius_server_windows_amd64.tar.gz mobius_server_windows_amd64
 
             tar -zcvf mobius_client_linux_amd64.tar.gz mobius_client_linux_amd64
             tar -zcvf mobius_client_darwin_amd64.tar.gz mobius_client_darwin_amd64
-            tar -zcvf mobius_client_windows_amd64.tar.gz mobius_client_windows_amd64
       - add_ssh_keys
       - run:
           name: create release

diff --git a/Makefile b/Makefile
index fb14198b4935e72abdd89c08f6ee5cae43adf9ca..9d31202760069bf6468c34a2589a86b4c469d393 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,3 +3,10 @@ build-client:
 
 build-server:
        go build -o mobius-hotline-server server/main.go
+
+windows_amd64_target=dist/mobius_server_windows_amd64
+build-win-amd64-server:
+       mkdir $(windows_amd64_target) ; true
+       cp -r cmd/mobius-hotline-server/mobius/config $(windows_amd64_target)
+       GOOS=windows GOARCH=amd64 go build -o $(windows_amd64_target)/mobius-hotline-server.exe  cmd/mobius-hotline-server/main.go
+       zip -r dist/mobius_server_windows_amd64.zip $(windows_amd64_target)
\ No newline at end of file