Fix CI on master

Author: coolreader18

.github/workflows/linux-build.yml

@@ -7,41 +7,15 @@ on:
     branches:
       - master
       - release/*
+      - noa/fix-master-ci
 
 jobs:
-  linux-amd64-cli:
-    runs-on: bare-metal
+  linux-cli:
+    strategy:
+      matrix:
+        runner: [bare-metal, arm-runner]
 
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Compile x86
-        run: |
-          export PATH=$HOME/.cargo/bin:$PATH
-          cargo build --release -p spacetimedb-cli
-          mkdir build
-          cp --sparse=never target/release/spacetime build/spacetime
-          cd build && tar -czf spacetime.linux-amd64.tar.gz spacetime
-          rm spacetime
-
-      - name: Extract branch name
-        shell: bash
-        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
-        id: extract_branch
-
-      - 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: ${{ vars.AWS_BUCKET }}
-          source_dir: build
-          endpoint: https://nyc3.digitaloceanspaces.com
-          destination_dir: ${{ steps.extract_branch.outputs.branch }}
-
-  linux-arm64-cli:
-    runs-on: arm-runner
+    runs-on: ${{ matrix.runner }}
 
     steps:
       - name: Checkout
@@ -52,9 +26,7 @@ jobs:
           export PATH=$HOME/.cargo/bin:$PATH
           cargo build --release -p spacetimedb-cli
           mkdir build
-          cp --sparse=never target/release/spacetime build/spacetime
-          cd build && tar -czf spacetime.linux-arm64.tar.gz spacetime
-          rm spacetime
+          tar -czf build/spacetime-"$(rustc --print host-tuple)".tar.gz -C target/release spacetimedb-{cli,standalone,update}
 
       - name: Extract branch name
         shell: bash