Git development
 help / color / mirror / Atom feed
From: Patrick Steinhardt <ps@pks.im>
To: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 1/4] ci(gitlab,windows): provision GNU Rust for SDK-based MinGW builds
Date: Thu, 24 Sep 2026 13:21:46 +0200	[thread overview]
Message-ID: <arUHyjHAX20ovmr8@pks.im> (raw)
In-Reply-To: <6a389b2bad1653175bde2a767ffbb5b672e324e2.1789819933.git.gitgitgadget@gmail.com>

On Sat, Sep 19, 2026 at 12:12:10PM +0000, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
> 
> The minimal Git for Windows SDK already supplies Git and GCC. The
> MinGW Makefile build needs the GNU Rust toolchain, not another Git
> installation or Meson.

Huh, what's GNU Rust?

> Let the dependency installer serve this configuration while keeping
> the existing package set for MSVC builds.

Okay. What's implicit here is that we in fact don't use this script at
all at the current point in time for our MinGW build, we rather use the
"install-sdk.ps1" script. I assume it will be wired up in the next step,
so let's read on.

> 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
> @@ -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"

Okay, so installing Rust is the only thing we will want to do on both
MSVC and MinGW builds.

Patrick

  reply	other threads:[~2026-09-24 11:21 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 [this message]
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   ` [PATCH v2 1/4] ci(gitlab,windows): provision GNU Rust for SDK-based MinGW builds Johannes Schindelin via GitGitGadget
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=arUHyjHAX20ovmr8@pks.im \
    --to=ps@pks.im \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=johannes.schindelin@gmx.de \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox