@matheusbsbs / matheus-bagliano / commits / 85e1d6819f

ci: use Visual Studio for win+meson job on GitHub Workflows

In 7304bd2bc39 (ci: wire up Visual Studio build with Meson, 2025-01-22) we have wired up a new CI job that builds and tests Git with Meson on a Windows machine. The expectation here was that this build uses the Visual Studio toolchain to do so, and that is true on GitLab CI. But on GitHub Workflows it is not the case because we've got GCC in our PATH, and thus Meson favors that compiler toolchain over Visual Studio's. Fix this by explicitly asking Meson to use the Visual Studio toolchain. While this is only really required for GitHub Workflows, let's also pass the flag in GitLab CI so that we don't implicitly assume the toolchain that Meson is going to pick. Reported-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed Mar 31, 2025 at 10:33 UTC 85e1d6819fbc32059d0170cfbfe7c1989f3753e8

2 files changed +2 -2

.github/workflows/main.yml

+1 -1

@@ -265,7 +265,7 @@ jobs:

265 run: pip install meson ninja

266 - name: Setup

267 shell: pwsh

268 - run: meson setup build -Dperl=disabled -Dcredential_helpers=wincred

268 + run: meson setup build --vsenv -Dperl=disabled -Dcredential_helpers=wincred

269 - name: Compile

270 shell: pwsh

271 run: meson compile -C build

.gitlab-ci.yml

+1 -1

@@ -164,7 +164,7 @@ build:msvc-meson:

164 extends: .msvc-meson

165 stage: build

166 script:

167 - - meson setup build -Dperl=disabled -Dbackend_max_links=1 -Dcredential_helpers=wincred

167 + - meson setup build --vsenv -Dperl=disabled -Dbackend_max_links=1 -Dcredential_helpers=wincred

168 - meson compile -C build

169 artifacts:

170 paths: