]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commit60b308a43b2e109c94b0ac27e17a7067fda2d289
tree7d377a910e2c537d922a0b4524a6de42d082bd1f
parenta773196f56847a5070d0ce568965b972ea515c6f
parent3afad3d8ae3ca59dea450ba96afa2d7ccaabab99
Merge branch 'ps/ci-gitlab-prepare-for-macos-14-deprecation' into next

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
.gitlab-ci.yml
meson.build