Skip to content

gitlab-ci: fix the cargo invocation in the Windows job #2233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dscho wants to merge 4 commits into
base: master
Choose a base branch
from
+20 −7
Open

gitlab-ci: fix the cargo invocation in the Windows job #2233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a389b2
ci(gitlab,windows): provision GNU Rust for SDK-based MinGW builds
dscho Sep 18, 2026
8855c25
ci(gitlab,windows): preserve exclusions during dependency setup
dscho Sep 18, 2026
57a83d1
ci(gitlab,windows): fix Rust setup for GitLab's MinGW build
dscho Sep 18, 2026
1ed79f0
ci(gitlab,windows): provide GNU Rust's host-linker support
dscho Sep 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,11 @@ build:mingw64:
before_script:
- *windows_before_script
- ./ci/install-sdk.ps1 -directory "git-sdk"
- ./ci/install-dependencies.ps1 -Mingw
script:
- git-sdk/usr/bin/bash.exe -l -c 'ci/make-test-artifacts.sh artifacts'
# The minimal SDK's profile resets PATH.
- git-sdk/usr/bin/bash.exe -l -c
'PATH=$PATH:/c/Rust/bin ci/make-test-artifacts.sh artifacts'
artifacts:
paths:
- artifacts
Expand Down
22 changes: 16 additions & 6 deletions ci/install-dependencies.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
param(
[string]$DownloadDirectory = '.dependencies'
[string]$DownloadDirectory = '.dependencies',
[switch]$Mingw
)

$ErrorActionPreference = 'Stop'
Expand All @@ -11,7 +12,9 @@ $RustVersion = '1.96.0'

New-Item -Path $DownloadDirectory -ItemType Directory -Force | Out-Null
New-Item -Path .git/info -ItemType Directory -Force | Out-Null
New-Item -Path .git/info/exclude -ItemType File -Force | Out-Null
if (-not (Test-Path .git/info/exclude)) {
New-Item -Path .git/info/exclude -ItemType File | Out-Null
}
Add-Content -Path .git/info/exclude -Value "/$DownloadDirectory"

function Get-Installer {
Expand Down Expand Up @@ -41,6 +44,17 @@ function Invoke-Installer {
}
}

$rustTarget = if ($Mingw) { 'gnu' } else { 'msvc' }
$rustMsi = Get-Installer "rust-$rustTarget.msi" (
"https://static.rust-lang.org/dist/" +
"rust-$RustVersion-x86_64-pc-windows-$rustTarget.msi")
Invoke-Installer msiexec.exe @('/i', $rustMsi, 'INSTALLDIR=C:\Rust',
"ADDLOCAL=Rustc,Cargo,Std$(if ($Mingw) { ',Gcc' })", '/quiet', '/norestart')

if ($Mingw) {
return
}

$gitAssetVersion = $GitVersion -replace '\.windows\.\d+$', ''
$gitInstaller = Get-Installer "Git-Installer.exe" `
"https://github.com/git-for-windows/git/releases/download/v$GitVersion/PortableGit-$gitAssetVersion-64-bit.7z.exe"
Expand All @@ -49,7 +63,3 @@ Invoke-Installer $gitInstaller @('-y', '-o"C:\Program Files\Git"')
$mesonMsi = Get-Installer "meson.msi" `
"https://github.com/mesonbuild/meson/releases/download/$MesonVersion/meson-$MesonVersion-64.msi"
Invoke-Installer msiexec.exe @('/i', $mesonMsi, 'INSTALLDIR=C:\Meson', '/quiet', '/norestart')

$rustMsi = Get-Installer "rust.msi" `
"https://static.rust-lang.org/dist/rust-$RustVersion-x86_64-pc-windows-msvc.msi"
Invoke-Installer msiexec.exe @('/i', $rustMsi, 'INSTALLDIR=C:\Rust', 'ADDLOCAL=Rustc,Cargo,Std', '/quiet', '/norestart')
Loading