Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: use msvc for turborepo #8677

Merged
merged 2 commits into from
Jul 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .github/actions/setup-rust/action.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: "Turbo Rust Setup"
description: "Sets up the Rust toolchain for CI"
inputs:
windows:
description: 'Set to "true" if setting up for Windows'
required: false
default: "false"
targets:
description: "Comma-separated list of target triples to install for this toolchain"
required: false
Expand Down Expand Up @@ -39,11 +35,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
Expand Down
5 changes: 0 additions & 5 deletions .github/actions/setup-turborepo-environment/action.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: "Setup Turborepo Environment"
description: "Sets up development environment for turborepo"
inputs:
windows:
description: 'Set to "true" if setting up for Windows'
required: false
default: "false"
github-token:
description: "GitHub token. You can pass secrets.GITHUB_TOKEN"
required: true
Expand All @@ -25,7 +21,6 @@ runs:
- name: "Setup Rust"
uses: ./.github/actions/setup-rust
with:
windows: ${{ inputs.windows }}
shared-cache-key: turborepo-debug-build
cache-key: ${{ inputs.target }}
save-cache: true
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/bench-turborepo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,9 @@ 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:
windows: ${{ matrix.os.name == 'windows' }}
github-token: "${{ secrets.GITHUB_TOKEN }}"

- name: Build Turborepo from source
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/turborepo-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,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:
Expand Down Expand Up @@ -227,10 +226,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' || '' }}
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/turborepo-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ jobs:
- name: Setup Turborepo Environment
uses: ./.github/actions/setup-turborepo-environment
with:
windows: ${{ matrix.os.runner == 'windows-latest' }}
github-token: "${{ secrets.GITHUB_TOKEN }}"
node-version: "18.20.2"

Expand Down Expand Up @@ -193,7 +192,6 @@ jobs:
- name: Setup Turborepo Environment
uses: ./.github/actions/setup-turborepo-environment
with:
windows: ${{ matrix.os.runner == 'windows-latest' }}
github-token: "${{ secrets.GITHUB_TOKEN }}"
node-version: "18.20.2"

Expand Down Expand Up @@ -373,7 +371,6 @@ jobs:
- name: Setup Turborepo Environment
uses: ./.github/actions/setup-turborepo-environment
with:
windows: ${{ matrix.os.runner == 'windows-latest' }}
github-token: "${{ secrets.GITHUB_TOKEN }}"
node-version: "18.20.2"

Expand Down
Loading