From 9128fb8f1e638f5ea13a9e65bdc1793a443abace Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 22:32:04 +0100 Subject: [PATCH] Stick with icu4c 74.2 on macOS CI for PHP-8.1 PHP-8.1 is not ready for ICU >= 75.1 which requires C++17 support. Thus we force the usage of icu4c@74, what is scheduled for removal in May 2025, though. Closes GH-16789. --- .github/actions/brew/action.yml | 2 +- .github/actions/configure-macos/action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/brew/action.yml b/.github/actions/brew/action.yml index 51d37aa56d470..3b36ec446ddca 100644 --- a/.github/actions/brew/action.yml +++ b/.github/actions/brew/action.yml @@ -21,7 +21,6 @@ runs: webp \ freetype \ intltool \ - icu4c \ libiconv \ zlib \ t1lib \ @@ -33,4 +32,5 @@ runs: libjpeg \ libxslt \ postgresql + brew reinstall icu4c@74 brew link icu4c gettext --force diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 7312ff5d69f19..b21f6466c444c 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -18,7 +18,7 @@ runs: export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxml2/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxslt/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/zlib/lib/pkgconfig" - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig" + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c@74/lib/pkgconfig" sed -i -e 's/Requires.private:.*//g' "$BREW_OPT/curl/lib/pkgconfig/libcurl.pc" ./buildconf --force ./configure \