Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit ab102c0

Browse filesBrowse files
authored
Merge pull request #29992 from timhoffm/update-winimage
Update pinned oldest win image on azure
2 parents a30354e + 76b5c83 commit ab102c0
Copy full SHA for ab102c0

File tree

1 file changed

+18
-45
lines changed
Filter options

1 file changed

+18
-45
lines changed

‎azure-pipelines.yml

Copy file name to clipboardExpand all lines: azure-pipelines.yml
+18-45Lines changed: 18 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ stages:
5050
strategy:
5151
matrix:
5252
Windows_py311:
53-
vmImage: 'windows-2019' # keep one job pinned to the oldest image
53+
vmImage: 'windows-2022' # Keep one job pinned to the oldest image
5454
python.version: '3.11'
5555
Windows_py312:
5656
vmImage: 'windows-latest'
@@ -101,50 +101,23 @@ stages:
101101
VS=$(ls -d /c/Program\ Files*/Microsoft\ Visual\ Studio/*/Enterprise)
102102
echo "Visual Studio: ${VS}"
103103
DIR="$VS/Common7/IDE/Extensions/Microsoft/CodeCoverage.Console"
104-
if [[ -d $DIR ]]; then
105-
# This is for MSVC 2022 (on windows-latest).
106-
TOOL="$DIR/Microsoft.CodeCoverage.Console.exe"
107-
for f in build/cp*/src/*.pyd; do
108-
echo $f
109-
echo "=============================="
110-
"$TOOL" instrument $f --session-id $SESSION_ID \
111-
--log-level Verbose --log-file instrument.log
112-
cat instrument.log
113-
rm instrument.log
114-
done
115-
echo "Starting $TOOL in server mode"
116-
"$TOOL" collect \
117-
--session-id $SESSION_ID --server-mode \
118-
--output-format cobertura --output extensions.xml \
119-
--log-level Verbose --log-file extensions.log &
120-
VS_VER=2022
121-
else
122-
DIR="$VS"/Team\ Tools/Dynamic\ Code\ Coverage\ Tools/amd64
123-
if [[ -d $DIR ]]; then
124-
# This is for MSVC 2019 (on windows-2019).
125-
VSINSTR="$VS"/Team\ Tools/Performance\ Tools/vsinstr.exe
126-
for f in build/cp*/src/*.pyd; do
127-
"$VSINSTR" $f -Verbose -Coverage
128-
done
129-
TOOL="$DIR/CodeCoverage.exe"
130-
cat > extensions.config << EOF
131-
<CodeCoverage>
132-
<CollectFromChildProcesses>true</CollectFromChildProcesses>
133-
<ModulePaths>
134-
<Include>
135-
<ModulePath>.*\\.*\.pyd</ModulePath>
136-
</Include>
137-
</ModulePaths>
138-
</CodeCoverage>
139-
EOF
140-
echo "Starting $TOOL in server mode"
141-
"$TOOL" collect \
142-
-config:extensions.config -session:$SESSION_ID \
143-
-output:extensions.coverage -verbose &
144-
echo "Started $TOOL"
145-
VS_VER=2019
146-
fi
147-
fi
104+
# This is for MSVC 2022 (on windows-latest).
105+
TOOL="$DIR/Microsoft.CodeCoverage.Console.exe"
106+
for f in build/cp*/src/*.pyd; do
107+
echo $f
108+
echo "=============================="
109+
"$TOOL" instrument $f --session-id $SESSION_ID \
110+
--log-level Verbose --log-file instrument.log
111+
cat instrument.log
112+
rm instrument.log
113+
done
114+
echo "Starting $TOOL in server mode"
115+
"$TOOL" collect \
116+
--session-id $SESSION_ID --server-mode \
117+
--output-format cobertura --output extensions.xml \
118+
--log-level Verbose --log-file extensions.log &
119+
VS_VER=2022
120+
148121
echo "##vso[task.setvariable variable=VS_COVERAGE_TOOL]$TOOL"
149122
150123
PYTHONFAULTHANDLER=1 pytest -rfEsXR -n 2 \

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.