Skip to content

Restore runs-on: windows-latest #5835

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
rwgk merged 3 commits into from
Sep 13, 2025
Merged

Restore runs-on: windows-latest #5835

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8d5c5b
Revert "s/windows-2022/windows-latest/ in .github/workflows/{ci,pip}.…
rwgk Sep 12, 2025
50d530f
Add module-level skip for Windows build >= 26100 in test_iostream.py
rwgk Sep 12, 2025
8b79a85
Changes suggested by at-henryiii
rwgk Sep 13, 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
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
- runs-on: macos-latest
python-version: 'graalpy-24.2'

- runs-on: windows-2022
- runs-on: windows-latest
python-version: '3.9'
cmake-args: -DPYBIND11_TEST_SMART_HOLDER=ON
- runs-on: windows-2022
Expand All @@ -138,19 +138,19 @@ jobs:
- runs-on: windows-2022
python-version: '3.13'
cmake-args: -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL
- runs-on: windows-2022
- runs-on: windows-latest
python-version: '3.13t'
cmake-args: -DCMAKE_CXX_STANDARD=17
- runs-on: windows-2022
- runs-on: windows-latest
python-version: '3.14'
cmake-args: -DCMAKE_CXX_STANDARD=20
- runs-on: windows-2022
- runs-on: windows-latest
python-version: '3.14t'
cmake-args: -DCMAKE_CXX_STANDARD=23
- runs-on: windows-2022
- runs-on: windows-latest
python-version: 'pypy-3.10'
cmake-args: -DCMAKE_CXX_STANDARD=17
- runs-on: windows-2022
- runs-on: windows-latest
python-version: 'pypy3.11'
cmake-args: -DCMAKE_CXX_STANDARD=20
# The setup-python action currently doesn't have graalpy for windows
Expand All @@ -174,7 +174,7 @@ jobs:
python-version: '3.9'
- runs-on: macos-latest
python-version: '3.12'
- runs-on: windows-2022
- runs-on: windows-latest
python-version: '3.11'

name: "🐍 ${{ matrix.python-version }} • ${{ matrix.runs-on }} • x64 inplace C++14"
Expand Down Expand Up @@ -1010,8 +1010,8 @@ jobs:

mingw:
if: github.event.pull_request.draft == false
name: "🐍 3 • windows-2022 • ${{ matrix.sys }}"
runs-on: windows-2022
name: "🐍 3 • windows-latest • ${{ matrix.sys }}"
runs-on: windows-latest
defaults:
run:
shell: msys2 {0}
Expand Down Expand Up @@ -1121,7 +1121,7 @@ jobs:

strategy:
matrix:
os: [windows-2022]
os: [windows-latest]
python: ['3.10']

runs-on: "${{ matrix.os }}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pip.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
# This builds the sdists and wheels and makes sure the files are exactly as
# expected.
test-packaging:
name: 🐍 3.8 • 📦 tests • windows-2022
runs-on: windows-2022
name: 🐍 3.8 • 📦 tests • windows-latest
runs-on: windows-latest

steps:
- uses: actions/checkout@v5
Expand Down
10 changes: 10 additions & 0 deletions tests/test_iostream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@

from pybind11_tests import iostream as m

if sys.platform == "win32":
Copy link
Collaborator

@henryiii henryiii Sep 13, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if sys.platform == "win32":
if sys.platform.startswith("win32"):

It's canonical to use startswith when checking sys.platform, though it's often not required.

Copy link
Collaborator Author

@rwgk rwgk Sep 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at this with a fresh eye: For a moment I forgot that we have env.WIN. Changed to use that: commit 8b79a85

wv_build = sys.getwindowsversion().build
skip_if_ge = 26100
if wv_build >= skip_if_ge:
pytest.skip(
f"Windows build {wv_build} >= {skip_if_ge}:"
" Skipping iostream capture (redirection regression under investigation)",
Copy link
Collaborator

@henryiii henryiii Sep 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
" Skipping iostream capture (redirection regression under investigation)",
" Skipping iostream capture (redirection regression needs investigation)",

Copy link
Collaborator Author

@rwgk rwgk Sep 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done: commit 8b79a85

allow_module_level=True,
)


def test_captured(capsys):
msg = "I've been redirected to Python, I hope!"
Expand Down
Loading