Skip to content

Commit 6396383

Browse files
authored
Remove actions/setup-python#1005 workaround + Retarget Win SDK for PyCOMTest (#2645)
1 parent 40ee25a commit 6396383

File tree

3 files changed

+8
-16
lines changed

3 files changed

+8
-16
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@v4
2222

2323
- name: Set up Python
24-
uses: actions/setup-python@v5
24+
uses: actions/setup-python@v6
2525
with:
2626
python-version: "3.9"
2727

.github/workflows/main.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/checkout@v4
3232

3333
- name: Set up Python ${{ matrix.python-version }}
34-
uses: actions/setup-python@v5
34+
uses: actions/setup-python@v6
3535
with:
3636
python-version: ${{ matrix.python-version }}
3737
architecture: ${{ matrix.architecture }}
@@ -40,14 +40,6 @@ jobs:
4040
check-latest: true
4141
allow-prereleases: true
4242

43-
- name: Fix user Scripts missing from PATH
44-
if: matrix.architecture == 'x86'
45-
run: |
46-
# Work around https://github.com/actions/setup-python/issues/1005
47-
$ScriptsPath = python -c "import sysconfig,os; print(sysconfig.get_path('scripts', f'{os.name}_user'))"
48-
echo $ScriptsPath
49-
Add-Content $env:GITHUB_PATH $ScriptsPath
50-
5143
- name: Build and install
5244
run: pip install . -v --user
5345

@@ -107,7 +99,7 @@ jobs:
10799
- uses: actions/checkout@v4
108100

109101
- name: Set up Python ${{ matrix.python-version }}
110-
uses: actions/setup-python@v5
102+
uses: actions/setup-python@v6
111103
with:
112104
python-version: ${{ matrix.python-version }}
113105
architecture: x64
@@ -151,7 +143,7 @@ jobs:
151143
timeout-minutes: 30
152144
steps:
153145
- uses: actions/checkout@v4
154-
- uses: actions/setup-python@v5
146+
- uses: actions/setup-python@v6
155147
with:
156148
# This job only needs to target the oldest supported version
157149
python-version: "3.8"
@@ -187,7 +179,7 @@ jobs:
187179
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
188180
steps:
189181
- uses: actions/checkout@v4
190-
- uses: actions/setup-python@v5
182+
- uses: actions/setup-python@v6
191183
with:
192184
python-version: ${{ matrix.python-version }}
193185
cache: pip

com/TestSources/PyCOMTest/PyCOMTest.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<Keyword>Win32Proj</Keyword>
2525
<!-- Target Windows Server 2022 which GitHub Actions run on -->
2626
<!-- https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md#windows-server-2022 -->
27-
<WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
27+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2828
</PropertyGroup>
2929
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3030
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -42,13 +42,13 @@
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v142</PlatformToolset>
45+
<PlatformToolset>v143</PlatformToolset>
4646
<CharacterSet>NotSet</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>DynamicLibrary</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
51-
<PlatformToolset>v142</PlatformToolset>
51+
<PlatformToolset>v143</PlatformToolset>
5252
<CharacterSet>NotSet</CharacterSet>
5353
</PropertyGroup>
5454
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

0 commit comments

Comments
 (0)