Skip to content

Commit 3458e53

Browse files
committed
Update pinned oldest win image on azure
The windows-2019 image will be deprecated on 1.6.2025. Also, this is a test whether the timeouts #29797 are related to the windows-2019 image.
1 parent aea28b6 commit 3458e53

File tree

1 file changed

+1
-21
lines changed

1 file changed

+1
-21
lines changed

azure-pipelines.yml

+1-21
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ stages:
5050
strategy:
5151
matrix:
5252
Windows_py311:
53-
vmImage: 'windows-2022' # 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'
@@ -100,25 +100,6 @@ stages:
100100
echo "Coverage session ID: ${SESSION_ID}"
101101
VS=$(ls -d /c/Program\ Files*/Microsoft\ Visual\ Studio/*/Enterprise)
102102
echo "Visual Studio: ${VS}"
103-
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
122103
DIR="$VS"/Team\ Tools/Dynamic\ Code\ Coverage\ Tools/amd64
123104
if [[ -d $DIR ]]; then
124105
# This is for MSVC 2019 (on windows-2019).
@@ -144,7 +125,6 @@ stages:
144125
echo "Started $TOOL"
145126
VS_VER=2019
146127
fi
147-
fi
148128
echo "##vso[task.setvariable variable=VS_COVERAGE_TOOL]$TOOL"
149129
150130
PYTHONFAULTHANDLER=1 pytest -rfEsXR -n 2 \

0 commit comments

Comments
 (0)