test(CI): manually handle git operation for windows jobs (#3634)

Leiyks · web-flow · commit 7f7b873e394b · 2026-02-11T00:36:40.000+01:00
* test(CI): add aggressive git cleanup on windows runner

Signed-off-by: Alexandre Rulleau &lt;alexandre.rulleau@datadoghq.com&gt;

* test(CI): add manual cleanup in before_script step

Signed-off-by: Alexandre Rulleau &lt;alexandre.rulleau@datadoghq.com&gt;

---------

Signed-off-by: Alexandre Rulleau &lt;alexandre.rulleau@datadoghq.com&gt;
diff --git a/.gitlab/generate-package.php b/.gitlab/generate-package.php
@@ -488,18 +488,32 @@
     IMAGE: "<?= $image ?>"
     ABI_NO: "<?= $abi_no ?>"
     PHP_VERSION: "<?= $major_minor ?>"
-    GIT_STRATEGY: clone
-    GIT_CONFIG_COUNT: 2
-    GIT_CONFIG_KEY_0: core.longpaths
-    GIT_CONFIG_VALUE_0: true
-    GIT_CONFIG_KEY_1: core.symlinks
-    GIT_CONFIG_VALUE_1: true
+    GIT_STRATEGY: none
     CONTAINER_NAME: ${CI_JOB_NAME_SLUG}-${CI_JOB_ID}
   script: |
+    # Aggressive Git cleanup
+    Write-Host "Performing aggressive workspace cleanup with cmd.exe..."
+    cmd /c "if exist .git rmdir /s /q .git" 2>$null
+    cmd /c "for /d %d in (*) do @rmdir /s /q ""%d""" 2>$null
+    cmd /c "del /f /s /q *" 2>$null
+    Write-Host "Cleanup complete."
+
     # Make sure we actually fail if a command fails
     $ErrorActionPreference = 'Stop'
     $PSNativeCommandUseErrorActionPreference = $true
 
+    # Manual git clone with proper config
+    Write-Host "Cloning repository..."
+    git config --global core.longpaths true
+    git config --global core.symlinks true
+    git clone --branch $env:CI_COMMIT_REF_NAME $env:CI_REPOSITORY_URL .
+    git checkout $env:CI_COMMIT_SHA
+
+    # Initialize submodules
+    Write-Host "Initializing submodules..."
+    git submodule update --init --recursive
+    Write-Host "Git setup complete."
+
     mkdir extensions_x86_64
     mkdir extensions_x86_64_debugsymbols
 
diff --git a/.gitlab/generate-tracer.php b/.gitlab/generate-tracer.php
@@ -118,20 +118,33 @@ function before_script_steps($with_docker_auth = false) {
       - PHP_MAJOR_MINOR: <?= json_encode($windows_minor_major_targets) ?>
 
   variables:
-    GIT_CONFIG_COUNT: 2
-    GIT_CONFIG_KEY_0: core.longpaths
-    GIT_CONFIG_VALUE_0: true
-    GIT_CONFIG_KEY_1: core.symlinks
-    GIT_CONFIG_VALUE_1: true
     CONTAINER_NAME: $CI_JOB_NAME_SLUG
-    GIT_STRATEGY: clone
-    GIT_CLEAN_FLAGS: -ffdxq
+    GIT_STRATEGY: none
     IMAGE: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_windows"
   script: |
+    # Agressive Git cleanup
+    Write-Host "Performing aggressive workspace cleanup with cmd.exe..."
+    cmd /c "if exist .git rmdir /s /q .git" 2>$null
+    cmd /c "for /d %d in (*) do @rmdir /s /q ""%d""" 2>$null
+    cmd /c "del /f /s /q *" 2>$null
+    Write-Host "Cleanup complete."
+
     # Make sure we actually fail if a command fails
     $ErrorActionPreference = 'Stop'
     $PSNativeCommandUseErrorActionPreference = $true
 
+    # Manual git clone with proper config
+    Write-Host "Cloning repository..."
+    git config --global core.longpaths true
+    git config --global core.symlinks true
+    git clone --branch $env:CI_COMMIT_REF_NAME $env:CI_REPOSITORY_URL .
+    git checkout $env:CI_COMMIT_SHA
+
+    # Initialize submodules
+    Write-Host "Initializing submodules..."
+    git submodule update --init --recursive
+    Write-Host "Git setup complete."
+
     mkdir dumps
 
     $names = @('httpbin-integration','request-replayer', $env:CONTAINER_NAME)
diff --git a/dockerfiles/ci/xfail_tests/7.1.list b/dockerfiles/ci/xfail_tests/7.1.list
@@ -257,6 +257,7 @@ ext/simplexml/tests/bug72971_2.phpt
 ext/simplexml/tests/simplexml_load_file.phpt
 ext/soap/tests/bug71610.phpt
 ext/soap/tests/bugs/bug28751.phpt
+ext/soap/tests/bugs/bug76348.phpt
 ext/sockets/tests/socket_connect_params.phpt
 ext/sockets/tests/socket_create_listen-nobind.phpt
 ext/sockets/tests/socket_create_pair.phpt
