diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-04-16 13:54:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-16 13:54:18 -0700 |
| commit | 7cfdb0abc60372fb28c25566623334fe86c365d1 (patch) | |
| tree | 5e2f3a63bfed464853f20a5bda6f81300539f7fd /.github/workflows | |
| parent | Merge branch 'sk/clar-trailer-urlmatch-norm-test' (diff) | |
| parent | ci: use Visual Studio for win+meson job on GitHub Workflows (diff) | |
| download | git-7cfdb0abc60372fb28c25566623334fe86c365d1.tar.gz git-7cfdb0abc60372fb28c25566623334fe86c365d1.zip | |
Merge branch 'ps/misc-build-fixes'
Random build fixes.
* ps/misc-build-fixes:
ci: use Visual Studio for win+meson job on GitHub Workflows
meson: distinguish build and target host binaries
meson: respect 'tests' build option in contrib
gitweb: fix generation of "gitweb.js"
meson: fix handling of '-Dcurl=auto'
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 11959fce24..83ca8e4182 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 |