Try again

paranext · Nov 22, 2024 · f2d7dd0 · f2d7dd0
1 parent 661a00f
commit f2d7dd0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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