Skip to content

Commit 786f5d1

Browse files
committed
Merge branch 'main' into disable-cron
2 parents 1a9ca96 + 6e1ce43 commit 786f5d1

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.github/workflows/linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,7 @@ jobs:
869869

870870

871871
# GitHub enforces a limit of 256 entries per matrix, which we exceeded above
872-
# so the CPytho 3.13 jobs are split out
872+
# so the CPython 3.13 jobs are split out
873873
build-313:
874874
strategy:
875875
fail-fast: false

.github/workflows/windows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ concurrency:
1111

1212
jobs:
1313
pythonbuild:
14-
runs-on: 'windows-2019'
14+
runs-on: 'windows-2022'
1515
steps:
1616
- uses: actions/checkout@v4
1717

@@ -62,7 +62,7 @@ jobs:
6262
options: 'freethreaded+pgo'
6363

6464
needs: pythonbuild
65-
runs-on: 'windows-2019'
65+
runs-on: 'windows-2022'
6666
steps:
6767
- uses: actions/checkout@v4
6868
with:
@@ -92,7 +92,7 @@ jobs:
9292
- name: Build
9393
shell: cmd
9494
run: |
95-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\${{ matrix.vcvars }}"
95+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\${{ matrix.vcvars }}"
9696
py.exe -3.9 build-windows.py --python ${{ matrix.py }} --sh c:\cygwin\bin\sh.exe --options ${{ matrix.options }}
9797
9898
- name: Validate Distribution

cpython-windows/build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1887,7 +1887,7 @@ def main() -> None:
18871887
parser.add_argument(
18881888
"--vs",
18891889
choices={"2019", "2022"},
1890-
default="2019",
1890+
default="2022",
18911891
help="Visual Studio version to use",
18921892
)
18931893
parser.add_argument(

src/validation.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ const PE_ALLOWED_LIBRARIES: &[&str] = &[
107107
"USERENV.dll",
108108
"VERSION.dll",
109109
"VCRUNTIME140.dll",
110+
"VCRUNTIME140_1.dll",
110111
"WINMM.dll",
111112
"WS2_32.dll",
112113
// Our libraries.

0 commit comments

Comments
 (0)