From bb694fa132fe602c92a7e96d5ccf3fef7986fff8 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Thu, 14 Dec 2023 08:25:06 +0100 Subject: [PATCH] ci: add jobs to test with the reftable backend Add CI jobs for both GitHub Workflows and GitLab CI to run Git with the new reftable backend. Signed-off-by: Patrick Steinhardt --- .github/workflows/main.yml | 9 +++++++++ .gitlab-ci.yml | 9 +++++++++ ci/lib.sh | 2 +- ci/run-build-and-tests.sh | 3 +++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4d97da57ec4e7b..1b43e49dadcecf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -266,6 +266,9 @@ jobs: - jobname: linux-sha256 cc: clang pool: ubuntu-latest + - jobname: linux-reftable + cc: clang + pool: ubuntu-latest - jobname: linux-gcc cc: gcc cc_package: gcc-8 @@ -277,6 +280,9 @@ jobs: - jobname: osx-clang cc: clang pool: macos-13 + - jobname: osx-reftable + cc: clang + pool: macos-13 - jobname: osx-gcc cc: gcc cc_package: gcc-13 @@ -287,6 +293,9 @@ jobs: - jobname: linux-leaks cc: gcc pool: ubuntu-latest + - jobname: linux-reftable-leaks + cc: gcc + pool: ubuntu-latest - jobname: linux-asan-ubsan cc: clang pool: ubuntu-latest diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 43bfbd8834707d..c0fa2fe90b4b81 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,6 +26,9 @@ test:linux: - jobname: linux-sha256 image: ubuntu:latest CC: clang + - jobname: linux-reftable + image: ubuntu:latest + CC: clang - jobname: linux-gcc image: ubuntu:20.04 CC: gcc @@ -40,6 +43,9 @@ test:linux: - jobname: linux-leaks image: ubuntu:latest CC: gcc + - jobname: linux-reftable-leaks + image: ubuntu:latest + CC: gcc - jobname: linux-asan-ubsan image: ubuntu:latest CC: clang @@ -79,6 +85,9 @@ test:osx: - jobname: osx-clang image: macos-13-xcode-14 CC: clang + - jobname: osx-reftable + image: macos-13-xcode-14 + CC: clang artifacts: paths: - t/failed-test-artifacts diff --git a/ci/lib.sh b/ci/lib.sh index d5dd2f269762a2..0a73fc7bd1c203 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -367,7 +367,7 @@ linux-musl) MAKEFLAGS="$MAKEFLAGS NO_REGEX=Yes ICONV_OMITS_BOM=Yes" MAKEFLAGS="$MAKEFLAGS GIT_TEST_UTF8_LOCALE=C.UTF-8" ;; -linux-leaks) +linux-leaks|linux-reftable-leaks) export SANITIZE=leak export GIT_TEST_PASSING_SANITIZE_LEAK=true export GIT_TEST_SANITIZE_LEAK_LOG=true diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh index 7a1466b8687f6b..c192bd613c03dd 100755 --- a/ci/run-build-and-tests.sh +++ b/ci/run-build-and-tests.sh @@ -37,6 +37,9 @@ linux-clang) linux-sha256) export GIT_TEST_DEFAULT_HASH=sha256 ;; +linux-reftable|linux-reftable-leaks|osx-reftable) + export GIT_TEST_DEFAULT_REF_FORMAT=reftable + ;; pedantic) # Don't run the tests; we only care about whether Git can be # built.