From 0929a6678bceb9355ab7e838c88a89fffa5de03b Mon Sep 17 00:00:00 2001 From: Timmy Welch Date: Sat, 9 Mar 2024 14:36:42 -0800 Subject: [PATCH] Update icu4c paths and upgrade packages on macOS --- .github/workflows/build.yaml | 4 ++-- .github/workflows/package.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f8372d2..be949ac 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,7 +1,7 @@ name: CI env: - PKG_CONFIG_PATH: /usr/local/opt/icu4c/lib/pkgconfig + PKG_CONFIG_PATH: /usr/local/opt/icu4c/lib/pkgconfig:/opt/homebrew/opt/icu4c/lib/pkgconfig LC_COLLATE: en_US.UTF-8 on: pull_request: @@ -66,7 +66,7 @@ jobs: - name: Install macos dependencies run: | - brew install icu4c pkg-config + brew upgrade && brew install icu4c pkg-config # export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"; # export PATH="/usr/local/opt/icu4c/bin:/usr/local/opt/icu4c/sbin:$PATH" if: runner.os == 'macOS' diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml index f79a00e..32bfcb8 100644 --- a/.github/workflows/package.yaml +++ b/.github/workflows/package.yaml @@ -1,7 +1,7 @@ name: Package env: - PKG_CONFIG_PATH: /usr/local/opt/icu4c/lib/pkgconfig + PKG_CONFIG_PATH: /usr/local/opt/icu4c/lib/pkgconfig:/opt/homebrew/opt/icu4c/lib/pkgconfig LC_COLLATE: en_US.UTF-8 on: push: @@ -33,7 +33,7 @@ jobs: - name: Install macos dependencies run: | - brew install icu4c pkg-config + brew upgrade && brew install icu4c pkg-config # export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"; # export PATH="/usr/local/opt/icu4c/bin:/usr/local/opt/icu4c/sbin:$PATH" if: runner.os == 'macOS'