All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Patrick Steinhardt <ps@pks.im>,
	Karthik Nayak <karthik.188@gmail.com>,
	Johannes Schindelin <johannes.schindelin@gmx.de>,
	Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH v2 1/4] ci(gitlab,windows): provision GNU Rust for SDK-based MinGW builds
Date: Thu, 24 Sep 2026 20:01:50 +0000	[thread overview]
Message-ID: <cdf2eff48020ef72bcfe36aa55467c9cc8ece9ac.1790280113.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2233.v2.git.1790280113.gitgitgadget@gmail.com>

From: Johannes Schindelin <johannes.schindelin@gmx.de>

The minimal Git for Windows SDK already supplies Git and GCC. The MinGW
Makefile build needs the Rust toolchain that targets GCC (as opposed to
the more common MSVC one), not another Git installation or Meson.

Prepare the `install-dependencies.ps1` script to be able to install the
GCC-targeting Rust toolchain.

Assisted-by: GPT-6
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 ci/install-dependencies.ps1 | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/ci/install-dependencies.ps1 b/ci/install-dependencies.ps1
index e3b367fa54..8c68fb0cfc 100755
--- a/ci/install-dependencies.ps1
+++ b/ci/install-dependencies.ps1
@@ -1,5 +1,6 @@
 param(
-    [string]$DownloadDirectory = '.dependencies'
+    [string]$DownloadDirectory = '.dependencies',
+    [switch]$Mingw
 )
 
 $ErrorActionPreference = 'Stop'
@@ -41,6 +42,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', '/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"
@@ -49,7 +61,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')
-- 
gitgitgadget


  reply	other threads:[~2026-09-24 20:01 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-19 12:12 [PATCH 0/4] gitlab-ci: fix the cargo invocation in the Windows job Johannes Schindelin via GitGitGadget
2026-09-19 12:12 ` [PATCH 1/4] ci(gitlab,windows): provision GNU Rust for SDK-based MinGW builds Johannes Schindelin via GitGitGadget
2026-09-24 11:21   ` Patrick Steinhardt
2026-09-24 19:26     ` Johannes Schindelin
2026-09-19 12:12 ` [PATCH 2/4] ci(gitlab,windows): preserve exclusions during dependency setup Johannes Schindelin via GitGitGadget
2026-09-24 11:21   ` Patrick Steinhardt
2026-09-19 12:12 ` [PATCH 3/4] ci(gitlab,windows): fix Rust setup for GitLab's MinGW build Johannes Schindelin via GitGitGadget
2026-09-24 11:22   ` Patrick Steinhardt
2026-09-24 19:55     ` Johannes Schindelin
2026-09-28  6:50       ` Patrick Steinhardt
2026-09-28 14:33         ` Junio C Hamano
2026-09-19 12:12 ` [PATCH 4/4] ci(gitlab,windows): provide GNU Rust's host-linker support Johannes Schindelin via GitGitGadget
2026-09-24 11:22   ` Patrick Steinhardt
2026-09-24 19:57     ` Johannes Schindelin
2026-09-19 13:37 ` [PATCH 0/4] gitlab-ci: fix the cargo invocation in the Windows job Karthik Nayak
2026-09-20 15:27   ` Johannes Schindelin
2026-09-21 14:03     ` Karthik Nayak
2026-09-22 11:50       ` Johannes Schindelin
2026-09-23 12:43         ` Karthik Nayak
2026-09-24 20:01 ` [PATCH v2 " Johannes Schindelin via GitGitGadget
2026-09-24 20:01   ` Johannes Schindelin via GitGitGadget [this message]
2026-09-24 20:01   ` [PATCH v2 2/4] ci(gitlab,windows): preserve exclusions during dependency setup Johannes Schindelin via GitGitGadget
2026-09-24 20:01   ` [PATCH v2 3/4] ci(gitlab,windows): fix Rust setup for GitLab's MinGW build Johannes Schindelin via GitGitGadget
2026-09-24 20:01   ` [PATCH v2 4/4] ci(gitlab,windows): provide GNU Rust's host-linker support Johannes Schindelin via GitGitGadget
2026-09-28  6:50   ` [PATCH v2 0/4] gitlab-ci: fix the cargo invocation in the Windows job Patrick Steinhardt
2026-09-28 13:41     ` Johannes Schindelin
2026-09-28 14:26     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cdf2eff48020ef72bcfe36aa55467c9cc8ece9ac.1790280113.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=johannes.schindelin@gmx.de \
    --cc=karthik.188@gmail.com \
    --cc=ps@pks.im \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.