From aeb78fec75d3ec3542473a08f85af3b7b41050f7 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 28 Sep 2023 15:41:21 +0200
Subject: [PATCH] No need to install rust?

---
 .github/workflows/macos-build.yml   | 13 ++++++++++---
 .github/workflows/windows-build.yml | 20 +++++++++++++-------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
index cef094b6c19..b696d988b10 100644
--- a/.github/workflows/macos-build.yml
+++ b/.github/workflows/macos-build.yml
@@ -12,10 +12,17 @@ jobs:
       - name: Install Rust
         run: |
           rustup target add aarch64-apple-darwin
-          curl https://sh.rustup.rs -sSf | sh -s -- -y
 
       - name: Show arch
         run: uname -a
 
-      - name: Compile
-        run: cargo build --release -p spacetimedb-cli --target=aarch64-apple-darwin
+      - name: Compile x86
+        run: |
+          cargo build --release -p spacetimedb-cli
+          mkdir build
+          mv target/release/spacetime build/spacetime-darwin-x86
+
+      - name: Compile Aarch64
+        run: |
+          cargo build --release -p spacetimedb-cli --target=aarch64-apple-darwin
+          mv target/release/spacetime build/spacetime-darwin-aarch64
diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
index 9dede9c909f..d30e0e34c8f 100644
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@@ -2,20 +2,26 @@ name: Build Windows SpacetimeDB client
 on: [push]
 
 jobs:
-  macos-client:
+  windows-client:
     runs-on: windows-latest
 
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Install Rust
-        run: |
-          rustup target add aarch64-apple-darwin
-          curl https://sh.rustup.rs -sSf | sh -s -- -y
-
       - name: Show arch
         run: uname -a
 
       - name: Compile
-        run: cargo build --release -p spacetimedb-cli
+        run: |
+          cargo build --release -p spacetimedb-cli
+          mkdir build
+          mv target/release/spacetime build/spacetime-windows-x86
+
+      - name: Upload to DO Spaces
+        uses: shallwefootball/s3-upload-action@master
+        with:
+          aws_key_id: ${{ secrets.AWS_KEY_ID }}
+          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
+          aws_bucket: ${{ secrets.AWS_BUCKET }}
+          source_dir: build