will darwin work?

phendryx · Dec 27, 2022 · c6f580e · c6f580e
1 parent fd0f78c
commit c6f580e
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,8 +20,27 @@ jobs:
   #     with:
   #       upload_url: ${{ github.event.release.upload_url }}
   #       asset_path: update-linux-amd64.gz
-  build-windows:
-    name: Build Windows Client
+  # build-windows:
+  #   name: Build Windows Client
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - uses: actions/checkout@v3
+  #   - name: Set up Go
+  #     uses: actions/setup-go@v3
+  #     with:
+  #       go-version: 1.16
+  #   - name: Build
+  #     run: make build-windows
+  #   - uses: shogo82148/actions-upload-release-asset@v1
+  #     with:
+  #       upload_url: ${{ github.event.release.upload_url }}
+  #       asset_path: update-windows-amd64.exe.gz
+  #   - uses: shogo82148/actions-upload-release-asset@v1
+  #     with:
+  #       upload_url: ${{ github.event.release.upload_url }}
+  #       asset_path: albiondata-client-amd64-installer.exe
+  build-darwin:
+    name: Build MacOS Client
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
@@ -34,8 +53,8 @@ jobs:
     - uses: shogo82148/actions-upload-release-asset@v1
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: update-windows-amd64.exe.gz
+        asset_path: update-darwin-amd64.gz
     - uses: shogo82148/actions-upload-release-asset@v1
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: albiondata-client-amd64-installer.exe
+        asset_path: albiondata-client-amd64-mac.zip
diff --git a/scripts/build-darwin.sh b/scripts/build-darwin.sh
@@ -4,6 +4,19 @@ set -eo pipefail
 
 apt-get update && apt-get install -y libpcap-dev zip
 
+sudo apt-get update && sudo apt-get install -y --no-install-recommends \
+		g++ \
+		gcc \
+		libc6-dev \
+		make \
+		pkg-config \
+        ca-certificates \
+        wget \  
+        git \      
+	build-essential \
+	mingw-w64 \
+	nsis
+
 export OSXCROSS_NO_INCLUDE_PATH_WARNINGS=1
 export MACOSX_DEPLOYMENT_TARGET=10.6
 export CC=/usr/osxcross/bin/o64-clang
@@ -30,6 +43,7 @@ cp -v run.command ./$TEMP/run.command
 chown -Rv ${USER}:${USER} ./$TEMP
 chmod -v 777 ./$TEMP/*
 zip -v ../$ZIPNAME -r ./"$TEMP"
+ls -la
 
 # In theory the following works to create an app but there was a permissions issue when opening on the mac
 # APP_NAME="Albion Data Client"