diff mbox series

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

Message ID 20250306-b4-pks-ci-meson-vsenv-v1-1-a65fe860289f@pks.im (mailing list archive)
State New
Headers show
Series ci: use Visual Studio for win+meson job on GitHub Workflows | expand

Commit Message

Patrick Steinhardt March 6, 2025, 11:31 a.m. UTC 
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>
---
Hi,

this patch addresses the issue reported by Johannes [1] where GitHub
Workflows doesn't use the Visual Studio toolchain in the win+Meson job
even though it should.

Builds for GitLab are at [2], GitHub at [3]. GitHub now uses the MSVC
toolchain as expected [4].

Thanks!

Patrick

[1]: <3e9ccffc7474698947bdcb6d49b5d0728deadd08.1741256780.git.gitgitgadget@gmail.com>
[2]: https://gitlab.com/gitlab-org/git/-/merge_requests/318
[3]: https://github.com/git/git/pull/1909
[4]: https://github.com/git/git/actions/runs/13697111615/job/38302001801?pr=1909#step:5:16
---
 .github/workflows/main.yml | 2 +-
 .gitlab-ci.yml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


---
base-commit: e969bc875963a10890d61ba84eab3a460bd9e535
change-id: 20250306-b4-pks-ci-meson-vsenv-e88b0d39ed2d
diff mbox series

Patch

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9959b61ece2..6a002485aeb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -265,7 +265,7 @@  jobs:
       run: pip install meson ninja
     - name: Setup
       shell: pwsh
-      run: meson setup build -Dperl=disabled -Dcredential_helpers=wincred
+      run: meson setup build --vsenv -Dperl=disabled -Dcredential_helpers=wincred
     - name: Compile
       shell: pwsh
       run: meson compile -C build
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2805cdeecb6..4798b283745 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -164,7 +164,7 @@  build:msvc-meson:
   extends: .msvc-meson
   stage: build
   script:
-    - meson setup build -Dperl=disabled -Dbackend_max_links=1 -Dcredential_helpers=wincred
+    - meson setup build --vsenv -Dperl=disabled -Dbackend_max_links=1 -Dcredential_helpers=wincred
     - meson compile -C build
   artifacts:
     paths: