From e6fdbceeaf8936cc18980b75435985de2a078ac9 Mon Sep 17 00:00:00 2001
From: Jeff Halter <868228+jhalter@users.noreply.github.com>
Date: Thu, 29 Jul 2021 17:53:46 -0700
Subject: Troubleshoot CI build

---
 .circleci/config.yml | 9 ++-------
 Makefile             | 7 +++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8bd72d5..e3e254a 100644
--- 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 fb14198..9d31202 100644
--- 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
-- 
cgit