From: Patrick Steinhardt Date: Fri, 06 Nov 2026 10:30:01 GMT Subject: [PATCH 1/7] gitlab-ci: speed up installation of Git for Windows SDK Message-ID: <20261106-pks-gitlab-ci-speedups-v1-1-1fa0374c7287@pks.im> In-Reply-To: <20261106-pks-gitlab-ci-speedups-v1-0-1fa0374c7287@pks.im> The "build:mingw64" job on GitLab CI downloads the minimal Git for Windows SDK on every run and then extracts it via `Expand-Archive`, which is expensive. Improve this by caching the SDK and by using tar(1) instead of `Expand-Archive`. Note that caching actually only gives us a win of a couple seconds. The bigger win here is using tar(1), which speeds up extracting the archive from 3 minutes to about 10 seconds. Regardless of that though, caching the SDK feels like a sensible thing to do as it removes one step that may spuriously fail. Signed-off-by: Patrick Steinhardt --- .gitlab-ci.yml | 9 ++++++++- ci/install-sdk.ps1 | 26 ++++++++++++++++++++------ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b7698a0037..15419a954b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,9 +127,16 @@ build:mingw64: - saas-windows-medium-amd64 variables: NO_PERL: 1 + cache: + key: + files: + - ci/install-sdk.ps1 + - ci/install-dependencies.ps1 + paths: + - .dependencies before_script: - *windows_before_script - - ./ci/install-sdk.ps1 -directory "git-sdk" + - ./ci/install-sdk.ps1 -Directory "git-sdk" - ./ci/install-dependencies.ps1 -Mingw script: # The minimal SDK's profile resets PATH. diff --git a/ci/install-sdk.ps1 b/ci/install-sdk.ps1 index 66f24838a40..1dbcef04a18 100755 --- a/ci/install-sdk.ps1 +++ b/ci/install-sdk.ps1 @@ -1,12 +1,26 @@ param( - [string]$directory='git-sdk', - [string]$url='https://github.com/git-for-windows/git-sdk-64/releases/download/ci-artifacts/git-sdk-x86_64-minimal.zip' + [string]$Directory='git-sdk', + [string]$URL='https://github.com/git-for-windows/git-sdk-64/releases/download/ci-artifacts/git-sdk-x86_64-minimal.zip', + [string]$DownloadDirectory='.dependencies' ) -Invoke-WebRequest "$url" -OutFile git-sdk.zip -Expand-Archive -LiteralPath git-sdk.zip -DestinationPath "$directory" -Remove-Item -Path git-sdk.zip +$ErrorActionPreference = 'Stop' +$ProgressPreference = 'SilentlyContinue' + +New-Item -Path $DownloadDirectory -ItemType Directory -Force + +$archive = Join-Path $DownloadDirectory 'git-sdk.zip' +if (-not (Test-Path $archive)) { + Invoke-WebRequest "$URL" -OutFile $archive -TimeoutSec 300 +} + +New-Item -Path $Directory -ItemType Directory -Force +tar -xf $archive -C $Directory +if ($LASTEXITCODE -ne 0) { + throw "Failed to extract $archive with exit code $LASTEXITCODE" +} New-Item -Path .git/info -ItemType Directory -Force New-Item -Path .git/info/exclude -ItemType File -Force -Add-Content -Path .git/info/exclude -Value "/$directory" +Add-Content -Path .git/info/exclude -Value "/$Directory" +Add-Content -Path .git/info/exclude -Value "/$DownloadDirectory" -- 2.56.0.500.g5d06dc02cd.dirty