summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-12-23 18:32:24 +0100
committerJunio C Hamano <gitster@pobox.com>2024-12-23 18:32:25 +0100
commit83c8f7623538e67262db18c98d9c1da6b50e289d (patch)
tree5e317bedaa760e01fda2f8fdd85d54a44f4ee79c /.github
parentMerge branch 'kl/doc-build-fix' (diff)
parentci: wire up Meson builds (diff)
downloadgit-83c8f7623538e67262db18c98d9c1da6b50e289d.tar.xz
git-83c8f7623538e67262db18c98d9c1da6b50e289d.zip
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
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/main.yml7
1 files changed, 7 insertions, 0 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1c0aa56b16..900be9957a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -282,6 +282,9 @@ jobs:
- jobname: osx-gcc
cc: gcc-13
pool: macos-13
+ - jobname: osx-meson
+ cc: clang
+ pool: macos-13
- jobname: linux-gcc-default
cc: gcc
pool: ubuntu-latest
@@ -294,11 +297,15 @@ jobs:
- jobname: linux-asan-ubsan
cc: clang
pool: ubuntu-latest
+ - jobname: linux-meson
+ cc: gcc
+ pool: ubuntu-latest
env:
CC: ${{matrix.vector.cc}}
CC_PACKAGE: ${{matrix.vector.cc_package}}
jobname: ${{matrix.vector.jobname}}
distro: ${{matrix.vector.pool}}
+ TEST_OUTPUT_DIRECTORY: ${{github.workspace}}/t
runs-on: ${{matrix.vector.pool}}
steps:
- uses: actions/checkout@v4