]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a773196 3afad3d)
Merge branch 'ps/ci-gitlab-prepare-for-macos-14-deprecation' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2026 22:43:08 +0000 (14:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2026 22:43:08 +0000 (14:43 -0800)
Move gitlab CI from macOS 14 images that are being deprecated.

* ps/ci-gitlab-prepare-for-macos-14-deprecation:
  gitlab-ci: update to macOS 15 images
  meson: detect broken iconv that requires ICONV_RESTART_RESET
  meson: simplify iconv-emits-BOM check

1  2 
.gitlab-ci.yml patch | diff1 | diff2 | blob | history
meson.build patch | diff1 | diff2 | blob | history

diff --cc .gitlab-ci.yml
Simple merge
diff --cc meson.build
Simple merge
Unnamed repository; edit this file 'description' to name the repository.