]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/meson-contrib-bits'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Mar 2025 16:53:02 +0000 (08:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Mar 2025 16:53:03 +0000 (08:53 -0800)
Update meson-based build procedure to cover contrib/ and other
places as well.

* ps/meson-contrib-bits:
  ci: exercise credential helpers
  ci: fix propagating UTF-8 test locale in musl-based Meson job
  meson: wire up static analysis via Coccinelle
  meson: wire up git-contacts(1)
  meson: wire up credential helpers
  contrib/credential: fix compilation of "osxkeychain" helper
  contrib/credential: fix compiling "libsecret" helper
  contrib/credential: fix compilation of wincred helper with MSVC
  contrib/credential: fix "netrc" tests with out-of-tree builds
  GIT-BUILD-OPTIONS: propagate project's source directory

1  2 
.gitlab-ci.yml
Makefile
meson.build
meson_options.txt

diff --cc .gitlab-ci.yml
index 86996fe941640012bef8187e3e5f876b837ef3a9,bb7d0c9ef1c363ab7f1d858e51a56a3d19a01aa2..ab2cbb453472bbf3f2106e3d8a43cc99d6d6f558
@@@ -164,7 -164,7 +164,7 @@@ build:msvc-meson
    extends: .msvc-meson
    stage: build
    script:
-     - meson setup build -Dperl=disabled -Dbackend_max_links=1
 -    - meson setup build -Dperl=disabled -Dcredential_helpers=wincred
++    - meson setup build -Dperl=disabled -Dbackend_max_links=1 -Dcredential_helpers=wincred
      - meson compile -C build
    artifacts:
      paths:
diff --cc Makefile
Simple merge
diff --cc meson.build
Simple merge
Simple merge