Skip to content

ci: Test i686-pc-windows-msvc as without host tools #5526

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.

Sign up for GitHub

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

Merged
JohnTitor merged 1 commit into from
Sep 13, 2026
+11 −5
Merged

ci: Test i686-pc-windows-msvc as without host tools #5526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ci/install-rust.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 4 additions & 2 deletions ci/verify-build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down