Skip to content
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

Test on GitHub Actions windows-2025 image #3116

Merged
merged 5 commits into from
Jan 13, 2025
Merged

Test on GitHub Actions windows-2025 image #3116

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
44db885
DRAFT: Test on GitHub Actions windows-2025 image
cclauss Jan 6, 2025
dce3aef
Windows 2025 currently ships with Visual Studio 2022
cclauss Jan 7, 2025
03b9529
Revert changes to lib/find-visualstudio.js
cclauss Jan 13, 2025
49e6a3f
Revert changes to lib/find-visualstudio.js
cclauss Jan 13, 2025
bf32867
Revert ALL changes to lib/find-visualstudio.js
cclauss Jan 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
19 changes: 11 additions & 8 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,17 @@ jobs:
needs: [lint-python]
strategy:
fail-fast: false
max-parallel: 15
max-parallel: 11
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
python: ["3.8", "3.10", "3.12"]
python: ["3.9", "3.11", "3.13"]
node: [18.x, 20.x, 22.x]
include: # `npm test` runs Windows find-visualstudio tests on an Intel Mac!!!
include:
- os: macos-13
python: "3.12"
python: "3.13"
node: 22.x
- os: windows-2025
python: "3.13"
node: 22.x
name: ${{ matrix.os }} - ${{ matrix.python }} - ${{ matrix.node }}
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -129,14 +132,14 @@ jobs:
- name: Run Python Tests
run: python -m pytest
- name: Run Tests (macOS or Linux)
if: "!startsWith(matrix.os, 'windows')"
if: runner.os != 'Windows'
shell: bash
run: npm test --python="${pythonLocation}/python"
env:
FULL_TEST: ${{ (matrix.node == '22.x' && matrix.python == '3.12') && '1' || '0' }}
FULL_TEST: ${{ (matrix.node == '22.x' && matrix.python == '3.13') && '1' || '0' }}
- name: Run Tests (Windows)
if: startsWith(matrix.os, 'windows')
if: runner.os == 'Windows'
shell: bash # Building wasm on Windows requires using make generator, it only works in bash
run: npm run test --python="${pythonLocation}\\python.exe"
env:
FULL_TEST: ${{ (matrix.node == '22.x' && matrix.python == '3.12') && '1' || '0' }}
FULL_TEST: ${{ (matrix.node == '22.x' && matrix.python == '3.13') && '1' || '0' }}
2 changes: 2 additions & 0 deletions .github/workflows/visual-studio.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:
msvs-verison: 2019
- os: windows-2022
msvs-version: 2022
- os: windows-2025
msvs-version: 2022 # Fix this when Visual Studio 2025 is released
runs-on: ${{ matrix.os }}
steps:
- name: Checkout Repository
Expand Down
6 changes: 3 additions & 3 deletions lib/find-visualstudio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class VisualStudioFinder {
}

async findVisualStudio2019OrNewerFromSpecifiedLocation () {
return this.findVSFromSpecifiedLocation([2019, 2022])
return this.findVSFromSpecifiedLocation([2019, 2022, 2025])
cclauss marked this conversation as resolved.
Show resolved Hide resolved
}

async findVisualStudio2017FromSpecifiedLocation () {
Expand Down Expand Up @@ -162,7 +162,7 @@ class VisualStudioFinder {
}

async findVisualStudio2019OrNewerUsingSetupModule () {
return this.findNewVSUsingSetupModule([2019, 2022])
return this.findNewVSUsingSetupModule([2019, 2022, 2025])
cclauss marked this conversation as resolved.
Show resolved Hide resolved
}

async findVisualStudio2017UsingSetupModule () {
Expand Down Expand Up @@ -223,7 +223,7 @@ class VisualStudioFinder {
// Invoke the PowerShell script to get information about Visual Studio 2019
// or newer installations
async findVisualStudio2019OrNewer () {
return this.findNewVS([2019, 2022])
return this.findNewVS([2019, 2022, 2025])
cclauss marked this conversation as resolved.
Show resolved Hide resolved
}

// Invoke the PowerShell script to get information about Visual Studio 2017
Expand Down
Loading