Merge pull request #208 from rage/jdk-17

Fix macos CI
rage · Aug 23, 2023 · c580ce6 · c580ce6
2 parents 2fc7c01 + 397a184
commit c580ce6
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/.github/workflows/upload-binaries.yml b/.github/workflows/upload-binaries.yml
@@ -50,18 +50,17 @@ jobs:
         if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }}
         run: sudo apt install -y gcc-arm-linux-gnueabihf
 
-      - name: Deploy
+      - name: Build
         run: |
           rustup target add ${{ matrix.target }}
-
-          # build and deploy CLI
           cargo build -p tmc-langs-cli --release --target ${{ matrix.target }}
-          gsutil cp ./target/${{ matrix.target }}/release/tmc-langs-cli gs://${{ secrets.GCP_BUCKET }}/tmc-langs-rust/tmc-langs-cli-${{ matrix.target }}-$TAG
-
-          # build and deploy Node module
           npm --prefix ./crates/bindings/tmc-langs-node install
           npm --prefix ./crates/bindings/tmc-langs-node run build -- --release --target ${{ matrix.target }}
-          gsutil cp ./crates/bindings/tmc-langs-node/ts/functions.node gs://${{ secrets.GCP_BUCKET }}/tmc-langs-rust/tmc-langs-${{ matrix.target }}-$TAG.node
+
+      - name: Deploy
+        run: |
+          gsutil cp ./target/${{ matrix.target }}/release/tmc-langs-cli gs://${{ secrets.GCP_BUCKET }}/tmc-langs-rust/tmc-langs-cli-${{ matrix.target }}-$TAG
+          gsutil cp ./crates/bindings/tmc-langs-node/ts/functions.node  gs://${{ secrets.GCP_BUCKET }}/tmc-langs-rust/tmc-langs-${{ matrix.target }}-$TAG.node
 
   windows:
     runs-on: windows-2022
@@ -99,7 +98,7 @@ jobs:
           $env:python_version=$(python -c 'import sys; print(\".\".join(map(str, sys.version_info[:3])))')
           $env:CLOUDSDK_PYTHON="C:\hostedtoolcache\windows\Python\$env:python_version\x64\python"
           gsutil cp ./target/${{ matrix.target }}/release/tmc-langs-cli.exe gs://${{ secrets.GCP_BUCKET }}/tmc-langs-rust/tmc-langs-cli-${{ matrix.target }}-$Env:TAG.exe
-          gsutil cp ./crates/bindings/tmc-langs-node/ts/functions.node             gs://${{ secrets.GCP_BUCKET }}/tmc-langs-rust/tmc-langs-${{ matrix.target }}-$Env:TAG.node
+          gsutil cp ./crates/bindings/tmc-langs-node/ts/functions.node      gs://${{ secrets.GCP_BUCKET }}/tmc-langs-rust/tmc-langs-${{ matrix.target }}-$Env:TAG.node
 
   macos:
     runs-on: macos-11
@@ -132,8 +131,8 @@ jobs:
           npm --prefix ./crates/bindings/tmc-langs-node install
           npm run --prefix ./crates/bindings/tmc-langs-node build -- --release
       - name: Sign
-        run: codesign --force -s - target/release/tmc-langs-cli
+        run: codesign --force -s - target/${{ matrix.target }}/release/tmc-langs-cli
       - name: Deploy
         run: |
-          gsutil cp ./target/release/tmc-langs-cli                      gs://${{ secrets.GCP_BUCKET }}/tmc-langs-rust/tmc-langs-cli-${{ matrix.target }}-$TAG
+          gsutil cp ./target/${{ matrix.target }}/release/tmc-langs-cli gs://${{ secrets.GCP_BUCKET }}/tmc-langs-rust/tmc-langs-cli-${{ matrix.target }}-$TAG
           gsutil cp ./crates/bindings/tmc-langs-node/ts/functions.node  gs://${{ secrets.GCP_BUCKET }}/tmc-langs-rust/tmc-langs-${{ matrix.target }}-$TAG.node