From aea28b6459a2d24e1d76d2c4354ee680c8092fc0 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Thu, 1 May 2025 08:47:13 +0200 Subject: [PATCH 1/3] 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. --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cc0fbce11377..19700f939cf2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -50,7 +50,7 @@ stages: strategy: matrix: Windows_py311: - vmImage: 'windows-2019' # keep one job pinned to the oldest image + vmImage: 'windows-2022' # Keep one job pinned to the oldest image python.version: '3.11' Windows_py312: vmImage: 'windows-latest' From 3458e537a2fd6ecd9ea27c84977e3585d4583e27 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Thu, 1 May 2025 09:57:52 +0200 Subject: [PATCH 2/3] 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. --- azure-pipelines.yml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 19700f939cf2..1d61ce4d6666 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -50,7 +50,7 @@ stages: strategy: matrix: Windows_py311: - vmImage: 'windows-2022' # Keep one job pinned to the oldest image + vmImage: 'windows-2022' # keep one job pinned to the oldest image python.version: '3.11' Windows_py312: vmImage: 'windows-latest' @@ -100,25 +100,6 @@ stages: echo "Coverage session ID: ${SESSION_ID}" VS=$(ls -d /c/Program\ Files*/Microsoft\ Visual\ Studio/*/Enterprise) echo "Visual Studio: ${VS}" - DIR="$VS/Common7/IDE/Extensions/Microsoft/CodeCoverage.Console" - if [[ -d $DIR ]]; then - # This is for MSVC 2022 (on windows-latest). - TOOL="$DIR/Microsoft.CodeCoverage.Console.exe" - for f in build/cp*/src/*.pyd; do - echo $f - echo "==============================" - "$TOOL" instrument $f --session-id $SESSION_ID \ - --log-level Verbose --log-file instrument.log - cat instrument.log - rm instrument.log - done - echo "Starting $TOOL in server mode" - "$TOOL" collect \ - --session-id $SESSION_ID --server-mode \ - --output-format cobertura --output extensions.xml \ - --log-level Verbose --log-file extensions.log & - VS_VER=2022 - else DIR="$VS"/Team\ Tools/Dynamic\ Code\ Coverage\ Tools/amd64 if [[ -d $DIR ]]; then # This is for MSVC 2019 (on windows-2019). @@ -144,7 +125,6 @@ stages: echo "Started $TOOL" VS_VER=2019 fi - fi echo "##vso[task.setvariable variable=VS_COVERAGE_TOOL]$TOOL" PYTHONFAULTHANDLER=1 pytest -rfEsXR -n 2 \ From 76b5c83cc1d5c0c2787df095d090bc1ab27444ce Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sat, 3 May 2025 23:25:38 -0400 Subject: [PATCH 3/3] CI: keep other branch of MSFT setup --- azure-pipelines.yml | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1d61ce4d6666..d68a9d36f0d3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -50,7 +50,7 @@ stages: strategy: matrix: Windows_py311: - vmImage: 'windows-2022' # keep one job pinned to the oldest image + vmImage: 'windows-2022' # Keep one job pinned to the oldest image python.version: '3.11' Windows_py312: vmImage: 'windows-latest' @@ -100,31 +100,24 @@ stages: echo "Coverage session ID: ${SESSION_ID}" VS=$(ls -d /c/Program\ Files*/Microsoft\ Visual\ Studio/*/Enterprise) echo "Visual Studio: ${VS}" - DIR="$VS"/Team\ Tools/Dynamic\ Code\ Coverage\ Tools/amd64 - if [[ -d $DIR ]]; then - # This is for MSVC 2019 (on windows-2019). - VSINSTR="$VS"/Team\ Tools/Performance\ Tools/vsinstr.exe - for f in build/cp*/src/*.pyd; do - "$VSINSTR" $f -Verbose -Coverage - done - TOOL="$DIR/CodeCoverage.exe" - cat > extensions.config << EOF - - true - - - .*\\.*\.pyd - - - - EOF - echo "Starting $TOOL in server mode" - "$TOOL" collect \ - -config:extensions.config -session:$SESSION_ID \ - -output:extensions.coverage -verbose & - echo "Started $TOOL" - VS_VER=2019 - fi + DIR="$VS/Common7/IDE/Extensions/Microsoft/CodeCoverage.Console" + # This is for MSVC 2022 (on windows-latest). + TOOL="$DIR/Microsoft.CodeCoverage.Console.exe" + for f in build/cp*/src/*.pyd; do + echo $f + echo "==============================" + "$TOOL" instrument $f --session-id $SESSION_ID \ + --log-level Verbose --log-file instrument.log + cat instrument.log + rm instrument.log + done + echo "Starting $TOOL in server mode" + "$TOOL" collect \ + --session-id $SESSION_ID --server-mode \ + --output-format cobertura --output extensions.xml \ + --log-level Verbose --log-file extensions.log & + VS_VER=2022 + echo "##vso[task.setvariable variable=VS_COVERAGE_TOOL]$TOOL" PYTHONFAULTHANDLER=1 pytest -rfEsXR -n 2 \