]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ps/ci-gitlab-prepare-for-macos-14-deprecation'
authorJunio C Hamano <gitster@pobox.com>
Thu, 12 Mar 2026 17:56:04 +0000 (10:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 12 Mar 2026 17:56:04 +0000 (10:56 -0700)
commitfdfa7f64d641fe21661087d7bdb0f58d66e3d2de
tree2f0f83cfc364a31d8d92509e47dbf6c29e58d38a
parentb2102627d7baf993dd128d33e77139ab7929fbef
parent3afad3d8ae3ca59dea450ba96afa2d7ccaabab99
Merge branch 'ps/ci-gitlab-prepare-for-macos-14-deprecation'

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