test

clockworklabs · Sep 28, 2023 · bc3bfcd · bc3bfcd
1 parent 442fb4f
commit bc3bfcd
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 23 deletions.
diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
@@ -10,26 +10,31 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Install Rust
+      - name: Add aarch64 target
         run: |
           rustup target add aarch64-apple-darwin
 
-      - name: Show arch
-        run: uname -a
-
-      - name: Compile x86
+      # - 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/aarch64-apple-darwin/release/spacetime build/spacetime-darwin-aarch64
+      #     find .
+
+      - name: Just testing
         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
+          touch build/macos
 
-      - name: Set env
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+      - 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
@@ -39,4 +44,4 @@ jobs:
           aws_bucket: ${{ vars.AWS_BUCKET }}
           source_dir: build
           endpoint: https://spacetimedb-client-binaries.nyc3.digitaloceanspaces.com
-          destination_dir: ${{ env.RELEASE_VERSION }}
+          destination_dir: ${{ steps.extract_branch.outputs.branch }}
diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
@@ -12,14 +12,21 @@ jobs:
       - name: Show arch
         run: uname -a
 
-      - name: Compile
+      # - name: Compile
+      #   run: |
+      #     cargo build --release -p spacetimedb-cli
+      #     mkdir build
+      #     mv target/release/spacetime.exe build/spacetime-windows-x86.exe
+
+      - name: Testing
         run: |
-          cargo build --release -p spacetimedb-cli
           mkdir build
-          mv target/release/spacetime build/spacetime-windows-x86
-
-      - name: Set env
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+          touch build/windows
+ 
+      - 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
@@ -28,5 +35,5 @@ jobs:
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
           aws_bucket: ${{ vars.AWS_BUCKET }}
           source_dir: build
-          endpoint: https://spacetimedb-client-binaries.nyc3.digitaloceanspaces.com
-          destination_dir: ${{ env.RELEASE_VERSION }}
+          endpoint: https://nyc3.digitaloceanspaces.com
+          destination_dir: ${{ steps.extract_branch.outputs.branch }}