Skip to content

Update to windows-2025 runner on ci #5571

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
youknowone merged 3 commits into from
Jan 7, 2026
Merged

Update to windows-2025 runner on ci #5571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cc5c6a
Update to windows-2025 on ci
coolreader18 Feb 28, 2025
588cfdd
Unmark unexpected successes
coolreader18 Mar 5, 2025
8afe918
Try adding .dll
coolreader18 Mar 5, 2025
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
22 changes: 4 additions & 18 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ env:
test_yield_from
# Python version targeted by the CI.
PYTHON_VERSION: "3.13.1"
X86_64_PC_WINDOWS_MSVC_OPENSSL_LIB_DIR: C:\Program Files\OpenSSL\lib\VC\x64\MD
X86_64_PC_WINDOWS_MSVC_OPENSSL_INCLUDE_DIR: C:\Program Files\OpenSSL\include

jobs:
rust_tests:
Expand All @@ -118,7 +120,7 @@ jobs:
timeout-minutes: 45
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
os: [macos-latest, ubuntu-latest, windows-2025]
fail-fast: false
steps:
- uses: actions/[email protected]
Expand All @@ -127,14 +129,6 @@ jobs:
components: clippy
- uses: Swatinem/rust-cache@v2

# Only for OpenSSL builds
# - name: Set up the Windows environment
# shell: bash
# run: |
# git config --system core.longpaths true
# cargo install --target-dir=target -v cargo-vcpkg
# cargo vcpkg -v build
# if: runner.os == 'Windows'
- name: Set up the Mac environment
run: brew install autoconf automake libtool
if: runner.os == 'macOS'
Expand Down Expand Up @@ -257,7 +251,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
os: [macos-latest, ubuntu-latest, windows-2025]
fail-fast: false
steps:
- uses: actions/[email protected]
Expand All @@ -266,14 +260,6 @@ jobs:
- uses: actions/[email protected]
with:
python-version: ${{ env.PYTHON_VERSION }}
# Only for OpenSSL builds
# - name: Set up the Windows environment
# shell: bash
# run: |
# git config --system core.longpaths true
# cargo install cargo-vcpkg
# cargo vcpkg build
# if: runner.os == 'Windows'
- name: Set up the Mac environment
run: brew install autoconf automake libtool openssl@3
if: runner.os == 'macOS'
Expand Down
15 changes: 5 additions & 10 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ permissions:

env:
CARGO_ARGS: --no-default-features --features stdlib,importlib,encodings,sqlite,ssl
X86_64_PC_WINDOWS_MSVC_OPENSSL_LIB_DIR: C:\Program Files\OpenSSL\lib\VC\x64\MD
X86_64_PC_WINDOWS_MSVC_OPENSSL_INCLUDE_DIR: C:\Program Files\OpenSSL\include

jobs:
build:
Expand All @@ -42,11 +44,11 @@ jobs:
target: aarch64-apple-darwin
# - runner: macos-latest
# target: x86_64-apple-darwin
- runner: windows-latest
- runner: windows-2025
target: x86_64-pc-windows-msvc
# - runner: windows-latest
# - runner: windows-2025
# target: i686-pc-windows-msvc
# - runner: windows-latest
# - runner: windows-2025
# target: aarch64-pc-windows-msvc
fail-fast: false
steps:
Expand All @@ -57,13 +59,6 @@ jobs:
- name: Set up Environment
shell: bash
run: rustup target add ${{ matrix.platform.target }}
- name: Set up Windows Environment
shell: bash
run: |
git config --global core.longpaths true
cargo install --target-dir=target -v cargo-vcpkg
cargo vcpkg -v build
if: runner.os == 'Windows'
- name: Set up MacOS Environment
run: brew install autoconf automake libtool
if: runner.os == 'macOS'
Expand Down
10 changes: 0 additions & 10 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,6 @@ lto = "thin"
# REDOX START, Uncomment when you want to compile/check with redoxer
# REDOX END

# Used only on Windows to build the vcpkg dependencies
[package.metadata.vcpkg]
git = "https://github.com/microsoft/vcpkg"
# The revision of the vcpkg repository to use
# https://github.com/microsoft/vcpkg/tags
rev = "2025.09.17"

[package.metadata.vcpkg.target]
x86_64-pc-windows-msvc = { triplet = "x64-windows-static-md", dev-dependencies = ["openssl" ] }

[package.metadata.packager]
product-name = "RustPython"
identifier = "com.rustpython.rustpython"
Expand Down
1 change: 0 additions & 1 deletion Lib/test/test_shutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ def test_rmtree_works_on_bytes(self):
self.assertIsInstance(victim, bytes)
shutil.rmtree(victim)

@unittest.skipIf(sys.platform == 'win32', 'TODO: RUSTPYTHON; flaky')
@os_helper.skip_unless_symlink
def test_rmtree_fails_on_symlink_onerror(self):
tmp = self.mkdtemp()
Expand Down
3 changes: 2 additions & 1 deletion crates/common/src/fileutils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,8 @@ pub mod windows {

let GetFileInformationByName = GET_FILE_INFORMATION_BY_NAME
.get_or_init(|| {
let library_name = OsString::from("api-ms-win-core-file-l2-1-4").to_wide_with_nul();
let library_name =
OsString::from("api-ms-win-core-file-l2-1-4.dll").to_wide_with_nul();
let module = unsafe { LoadLibraryW(library_name.as_ptr()) };
if module.is_null() {
return None;
Expand Down
Loading