Merge pull request #1383 from hacklschorsch/fix-windos-ci

4114: Fix windows CI
This commit is contained in:
meejah 2024-11-08 11:05:27 -07:00 committed by GitHub
commit 6cf67471f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 8 deletions

View File

@ -130,7 +130,7 @@ workflows:
# of Python, we probably have to do something here.
pythonVersion:
- "3.9"
- "3.11"
- "3.12"
- "integration":
# Run even the slow integration tests here. We need the `--` to
@ -249,11 +249,6 @@ jobs:
# PowerShell string escape character.
Add-Content -Path $Profile.CurrentUserAllHosts -Value "`$env:PATH = `"$p;$q;`$env:PATH`""
- "run":
name: "Display tool versions"
command: |
python misc/build_helpers/show-tool-versions.py
- "run":
# It's faster to install a wheel than a source package. If we don't
# have a cached wheelhouse then build all of the wheels and dump
@ -262,6 +257,9 @@ jobs:
# doesn't cost us anything extra and saves us effort next time.
name: "(Maybe) Build Wheels"
command: |
python -m pip install setuptools # Some Pythons for Windows do not come with setuptools
python setup.py update_version # Cheat to win a race about writing _version.py
if ((Test-Path .\wheelhouse) -and (Test-Path .\wheelhouse\*)) {
echo "Found populated wheelhouse, skipping wheel building."
} else {
@ -284,6 +282,11 @@ jobs:
command: |
python -m pip install .[testenv] .[test]
- "run":
name: "Display tool versions"
command: |
python misc/build_helpers/show-tool-versions.py
- "run":
name: "Run Unit Tests"
environment:
@ -730,7 +733,7 @@ executors:
# requirements and goals.
# https://circleci.com/developer/orbs/orb/circleci/windows#executors-server-2022
machine:
image: "windows-server-2022-gui:2023.06.1"
image: "windows-server-2022-gui:current"
shell: "powershell.exe -ExecutionPolicy Bypass"
resource_class: "windows.large"

0
newsfragments/4114.minor Normal file
View File

View File

@ -108,7 +108,7 @@ install_requires = [
"six >= 1.10.0",
# for 'tahoe invite' and 'tahoe join'
# For 'tahoe invite' and 'tahoe join'
"magic-wormhole >= 0.10.2",
# We want a new enough version to support custom JSON encoders.