aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-07-07 14:12:57 -0700
committerJunio C Hamano <gitster@pobox.com>2025-07-07 14:12:58 -0700
commit649162c7a9b38671d828bb0af80538f7e233fc29 (patch)
treeaa1af6c2d3a3c48c7aac33933c65b2021ed6f7a8
parent0dc5b7627e337d6f7a4515f41f8e7ad525b658ab (diff)
parent1e77de1864e8612370d83caae95112218688ab17 (diff)
downloadgit-649162c7a9b38671d828bb0af80538f7e233fc29.tar.xz
Merge branch 'cb/ci-freebsd-update-to-14.3'
CI updates. * cb/ci-freebsd-update-to-14.3: ci: update FreeBSD image to 14.3
-rw-r--r--.cirrus.yml8
1 files changed, 5 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 1fbdc2652b..fef04a3840 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -5,11 +5,13 @@ freebsd_task:
env:
GIT_PROVE_OPTS: "--timer --jobs 10"
GIT_TEST_OPTS: "--no-chain-lint --no-bin-wrappers"
- MAKEFLAGS: "-j4"
+ GIT_SKIP_TESTS: t7815.12
+ MAKEFLAGS: -j4
DEFAULT_TEST_TARGET: prove
+ DEFAULT_UNIT_TEST_TARGET: unit-tests-prove
DEVELOPER: 1
freebsd_instance:
- image_family: freebsd-13-4
+ image_family: freebsd-14-3
memory: 2G
install_script:
pkg install -y gettext gmake perl5
@@ -19,4 +21,4 @@ freebsd_task:
build_script:
- su git -c gmake
test_script:
- - su git -c 'gmake DEFAULT_UNIT_TEST_TARGET=unit-tests-prove test unit-tests'
+ - su git -c 'gmake test unit-tests'