chore: use msvc for turborepo

vercel · Jul 5, 2024 · 9d35003 · 9d35003
1 parent 118b365
commit 9d35003
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml
@@ -39,11 +39,6 @@ runs:
  shell: bash
  run: sudo apt-get -y update && sudo apt-get install -y lld
 
- - name: "Set Windows default host to MinGW"
- if: ${{ inputs.windows == 'true' }}
- shell: bash
- run: rustup set default-host x86_64-pc-windows-gnu && rustup show
-
  - name: Set Up Protoc
  id: set-up-protoc
  continue-on-error: true

diff --git a/.github/workflows/bench-turborepo.yml b/.github/workflows/bench-turborepo.yml
@@ -73,12 +73,6 @@ jobs:
  shell: bash
  run: echo "${{ steps.filename.outputs.filename }}"
 
- # setup Rust on windows, because apparently setup-turborepo-environment doesn't do this
- # TODO: put this logic in ./github/actions/setup-rust and use that instead
- - name: Add rustup for windows
- if: ${{ matrix.os.runner == 'windows-latest'}}
- run: rustup target add x86_64-pc-windows-gnu
-
  - name: Setup Turborepo Environment
  uses: ./.github/actions/setup-turborepo-environment
  with:

diff --git a/.github/workflows/turborepo-release.yml b/.github/workflows/turborepo-release.yml
@@ -124,8 +124,7 @@ jobs:
  rust-build-env: 'CC_aarch64_unknown_linux_musl=clang AR_aarch64_unknown_linux_musl=llvm-ar RUSTFLAGS="-Clink-self-contained=yes -Clinker=rust-lld"'
  setup: "sudo apt-get update && sudo apt-get install -y build-essential musl-tools clang llvm gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu"
  - host: windows-latest
- target: x86_64-pc-windows-gnu
- setup: "rustup set default-host x86_64-pc-windows-gnu"
+ target: x86_64-pc-windows-msvc
  container-options: "--rm"
  runs-on: ${{ matrix.settings.host }}
  container:
@@ -224,10 +223,10 @@ jobs:
  run: |
  mv rust-artifacts/turbo-aarch64-apple-darwin cli/dist-darwin-arm64
  mv rust-artifacts/turbo-aarch64-unknown-linux-musl cli/dist-linux-arm64
- cp -r rust-artifacts/turbo-x86_64-pc-windows-gnu cli/dist-windows-arm64
+ cp -r rust-artifacts/turbo-x86_64-pc-windows-msvc cli/dist-windows-arm64
  mv rust-artifacts/turbo-x86_64-unknown-linux-musl cli/dist-linux-amd64
  mv rust-artifacts/turbo-x86_64-apple-darwin cli/dist-darwin-amd64
- mv rust-artifacts/turbo-x86_64-pc-windows-gnu cli/dist-windows-amd64
+ mv rust-artifacts/turbo-x86_64-pc-windows-msvc cli/dist-windows-amd64
 
  - name: Perform Release
  run: cd cli && make publish-turbo SKIP_PUBLISH=${{ inputs.dry_run && '--skip-publish' || '' }}