From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Dec 2024 17:32:24 +0000 (-0800)
Subject: Merge branch 'ps/ci-meson'
X-Git-Tag: v2.48.0-rc1~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83c8f7623538e67262db18c98d9c1da6b50e289d;p=thirdparty%2Fgit.git

Merge branch 'ps/ci-meson'

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
---

83c8f7623538e67262db18c98d9c1da6b50e289d
diff --cc .gitlab-ci.yml
index 008966cae4,3eec72ddc6..9254e01583
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -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