diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 85d93b249528..3ac963f56bd3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -140,6 +140,7 @@ jobs: os: ubuntu-26.04-arm - target: i686-pc-windows-msvc os: windows-2025 + host: x86_64-pc-windows-msvc # Tier 1 without host tools - target: i686-unknown-linux-gnu - target: x86_64-pc-windows-gnu os: windows-2025 @@ -149,6 +150,7 @@ jobs: runs-on: ${{ matrix.os && matrix.os || 'ubuntu-26.04' }} timeout-minutes: 25 env: + RUST_HOST: ${{ matrix.host }} TARGET: ${{ matrix.target }} steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 diff --git a/Cargo.toml b/Cargo.toml index d99c58496776..56a782ffbffb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,16 +24,18 @@ default-target = "x86_64-unknown-linux-gnu" targets = [ # Note: Keep this in sync with ci/verify-build.py # - # Tier 1 + # Tier 1 with host tools "aarch64-apple-darwin", "aarch64-pc-windows-msvc", "aarch64-unknown-linux-gnu", - "i686-pc-windows-msvc", "i686-unknown-linux-gnu", "x86_64-pc-windows-gnu", "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", # + # Tier 1 without host tools + "i686-pc-windows-msvc", + # # Tier 2 with host tools "aarch64-pc-windows-gnullvm", "aarch64-unknown-linux-musl", diff --git a/ci/install-rust.sh b/ci/install-rust.sh index b40f1df4e7a5..9425d1a694d1 100755 --- a/ci/install-rust.sh +++ b/ci/install-rust.sh @@ -19,7 +19,7 @@ case "$(uname -s)" in esac if [ "$os" = "windows" ] && [ -n "${TARGET:-}" ]; then - toolchain="$toolchain-$TARGET" + toolchain="$toolchain-${RUST_HOST:-$TARGET}" rustup set profile minimal fi diff --git a/ci/verify-build.py b/ci/verify-build.py index c7f12fd77591..14ee05a2cea4 100755 --- a/ci/verify-build.py +++ b/ci/verify-build.py @@ -80,16 +80,18 @@ class TargetResult: FREEBSD_VERSIONS = [11, 12, 13, 14, 15] TARGETS = [ - # Tier 1 + # Tier 1 with host tools Target("aarch64-apple-darwin"), Target("aarch64-pc-windows-msvc"), Target("aarch64-unknown-linux-gnu"), - Target("i686-pc-windows-msvc"), Target("i686-unknown-linux-gnu"), Target("x86_64-pc-windows-gnu"), Target("x86_64-pc-windows-msvc"), Target("x86_64-unknown-linux-gnu"), # + # Tier 1 without host tools + Target("i686-pc-windows-msvc"), + # # Tier 2 with host tools Target("aarch64-pc-windows-gnullvm", min_toolchain=Toolchain.STABLE), Target("aarch64-unknown-linux-musl"),