]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/ci-meson'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Dec 2024 17:32:24 +0000 (09:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Dec 2024 17:32:25 +0000 (09:32 -0800)
The meson-build procedure is integrated into CI to catch and
prevent bitrotting.

* ps/ci-meson:
  ci: wire up Meson builds
  t: introduce compatibility options to clar-based tests
  t: fix out-of-tree tests for some git-p4 tests
  Makefile: detect missing Meson tests
  meson: detect missing tests at configure time
  t/unit-tests: rename clar-based unit tests to have a common prefix
  Makefile: drop -DSUPPRESS_ANNOTATED_LEAKS
  ci/lib: support custom output directories when creating test artifacts

1  2 
.github/workflows/main.yml
.gitlab-ci.yml
Makefile
ci/lib.sh
meson.build
t/unit-tests/u-strvec.c

Simple merge
diff --cc .gitlab-ci.yml
index 008966cae4d6a08694d46f2534e0e0e2967a53fc,3eec72ddc666f593521058b5f38eb6220f42ce0f..9254e01583306e67dc12b6b9e0015183e1108655
@@@ -99,11 -104,14 +104,14 @@@ test:osx
    parallel:
      matrix:
        - jobname: osx-clang
 -        image: macos-13-xcode-14
 +        image: macos-14-xcode-15
          CC: clang
        - jobname: osx-reftable
 -        image: macos-13-xcode-14
 +        image: macos-14-xcode-15
          CC: clang
+       - jobname: osx-meson
+         image: macos-14-xcode-15
+         CC: clang
    artifacts:
      paths:
        - t/failed-test-artifacts
diff --cc Makefile
Simple merge
diff --cc ci/lib.sh
Simple merge
diff --cc meson.build
Simple merge
Simple merge