diff --git a/.github/workflows/package-main.yml b/.github/workflows/package-main.yml index d60c4fa0a8..10a9efbc67 100644 --- a/.github/workflows/package-main.yml +++ b/.github/workflows/package-main.yml @@ -34,20 +34,12 @@ jobs: - name: Install icu4c on macOS if: ${{ matrix.os == 'macos-latest' }} - run: | - sudo port -v install icu +universal + run: sudo port -v install icu @74.2_0 +universal - name: Fixup loader paths for icu4c if: ${{ matrix.os == 'macos-latest' }} run: | - unique_files=() - for dylib in /opt/local/lib/libicu*.dylib; do - real_path=$(readlink -f "$dylib") - if [[ ! " ${unique_files[@]} " =~ " ${real_path} " ]]; then - unique_files+=("$real_path") - sudo install_name_tool -add_rpath @loader_path/ "$real_path" - fi - done + sudo install_name_tool -change /opt/local/lib/libicudata.74.dylib @loader_path/libicudata.74.dylib /opt/local/lib/libicuuc.74.dylib - name: Checkout git repo uses: actions/checkout@v4 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 20d6af43b7..b12928a26b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -34,20 +34,12 @@ jobs: - name: Install icu4c on macOS if: ${{ matrix.os == 'macos-latest' }} - run: | - sudo port -v install icu +universal + run: sudo port -v install icu @74.2_0 +universal - name: Fixup loader paths for icu4c if: ${{ matrix.os == 'macos-latest' }} run: | - unique_files=() - for dylib in /opt/local/lib/libicu*.dylib; do - real_path=$(readlink -f "$dylib") - if [[ ! " ${unique_files[@]} " =~ " ${real_path} " ]]; then - unique_files+=("$real_path") - sudo install_name_tool -add_rpath @loader_path/ "$real_path" - fi - done + sudo install_name_tool -change /opt/local/lib/libicudata.74.dylib @loader_path/libicudata.74.dylib /opt/local/lib/libicuuc.74.dylib - name: Checkout git repo uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index becaa0f3d0..ce41d12de7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,19 +37,12 @@ jobs: - name: Install icu4c on macOS if: ${{ matrix.os == 'macos-latest' }} - run: sudo port -v install icu +universal + run: sudo port -v install icu @74.2_0 +universal - name: Fixup loader paths for icu4c if: ${{ matrix.os == 'macos-latest' }} run: | - unique_files=() - for dylib in /opt/local/lib/libicu*.dylib; do - real_path=$(readlink -f "$dylib") - if [[ ! " ${unique_files[@]} " =~ " ${real_path} " ]]; then - unique_files+=("$real_path") - sudo install_name_tool -add_rpath @loader_path/ "$real_path" - fi - done + sudo install_name_tool -change /opt/local/lib/libicudata.74.dylib @loader_path/libicudata.74.dylib /opt/local/lib/libicuuc.74.dylib - name: Check out Git repository uses: actions/checkout@v4