Skip to content

limit windows builds to Rust 1.77 (to keep Windows 7 support) #1463

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
merged 3 commits into from
Sep 23, 2024
Merged

limit windows builds to Rust 1.77 (to keep Windows 7 support) #1463

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
044f437
limit windows builds to Rust 1.77 (to keep Windows 7 support)
davidhewitt Sep 23, 2024
bca9522
match llvm tools to build chain
davidhewitt Sep 23, 2024
ad6478e
pass rust toolchain through PGO build steps
davidhewitt Sep 23, 2024
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
17 changes: 10 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,9 @@ jobs:
target: ${{ matrix.target }}
manylinux: ${{ matrix.manylinux }}
args: --release --out dist --interpreter ${{ matrix.interpreter || '3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10' }}
rust-toolchain: stable
# Limit windows builds to 1.77 to keep Windows 7 support.
# FIXME: Unpin when Python 3.8 support is dropped. (3.9 requires Windows 10)
rust-toolchain: ${{ (matrix.os == 'windows' && '1.77') || 'stable' }}
docker-options: -e CI

- run: ${{ (matrix.os == 'windows' && 'dir') || 'ls -lh' }} dist/
Expand Down Expand Up @@ -535,17 +537,18 @@ jobs:

- name: install rust stable
id: rust-toolchain
uses: dtolnay/rust-toolchain@stable
uses: dtolnay/rust-toolchain@master
with:
components: llvm-tools
# Limit windows builds to 1.77 to keep Windows 7 support.
# FIXME: Unpin when Python 3.8 support is dropped. (3.9 requires Windows 10)
toolchain: ${{ (matrix.os == 'windows' && '1.77') || 'stable' }}

- run: pip install -U 'ruff==0.5.0' typing_extensions

# generate self-schema now, so we don't have to do so inside docker in maturin build
- run: python generate_self_schema.py

- run: rustc --version --verbose

- name: build initial wheel
uses: PyO3/maturin-action@v1
with:
Expand All @@ -554,7 +557,7 @@ jobs:
--release
--out pgo-wheel
--interpreter ${{ matrix.interpreter }}
rust-toolchain: stable
rust-toolchain: ${{ steps.rust-toolchain.outputs.name }}
docker-options: -e CI
env:
RUSTFLAGS: "-Cprofile-generate=${{ github.workspace }}/profdata"
Expand All @@ -569,7 +572,7 @@ jobs:
pip install -r tests/requirements.txt
pip install pydantic-core --no-index --no-deps --find-links pgo-wheel --force-reinstall
pytest tests/benchmarks
rustup run stable bash -c 'echo LLVM_PROFDATA=$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/${{ env.RUST_HOST }}/bin/llvm-profdata >> "$GITHUB_ENV"'
rustup run ${{ steps.rust-toolchain.outputs.name }} bash -c 'echo LLVM_PROFDATA=$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/${{ env.RUST_HOST }}/bin/llvm-profdata >> "$GITHUB_ENV"'

- name: merge pgo data
run: ${{ env.LLVM_PROFDATA }} merge -o ${{ github.workspace }}/merged.profdata ${{ github.workspace }}/profdata
Expand All @@ -582,7 +585,7 @@ jobs:
--release
--out dist
--interpreter ${{ matrix.interpreter }}
rust-toolchain: stable
rust-toolchain: ${{steps.rust-toolchain.outputs.name}}
docker-options: -e CI
env:
RUSTFLAGS: "-Cprofile-use=${{ github.workspace }}/merged.profdata"
Expand Down
Loading