Cache iconv too

Author: ychin

.github/actions/universal-package/action.yml

@@ -7,15 +7,19 @@ description: Create universal Homebrew package which contains x86_64 and arm64
 # that has both x86_64 and arm64 arch, as Homebrew's distributed bottles are thin binaries with only one arch.
 #
 # We still use Homebrew to manage the library because their formulas are up to date and have correct build instructions
-# that will work. This way we don't have to manually configuring and building and updating the package info.
+# that will work. This way we don't have to manually configure, build, and update the package info.
 
 inputs:
   formula:
-    description: Formura name
+    description: Formula name
     required: true
   contents:
     description: Path for contents in package's keg
     required: true
+  gnuiconv:
+    description: Use the Homebrew GNU libiconv instead of system one
+    type: boolean
+    required: false
 runs:
   using: 'composite'
   steps:
@@ -31,20 +35,21 @@ runs:
         # version and stomp what we have here.
         brew update
 
-        # Patch the official Homebrew formula to explicitly build for min deployment target and a universal binary.
-        #
-        # We also need to explicitly use system Clang because Homebrew's bundled clang script tries to inject -march
+        # Patch the official Homebrew formula to explicitly build for min deployment target and a universal binary. We
+        # also need to explicitly use system Clang because Homebrew's bundled clang script tries to inject -march
         # compiler flags that will cause universal builds to fail as Clang does not like that.
-        #
-        # We also manually depend on GNU libiconv as Apple iconv is broken since macOS 14. This is necessary as MacVim
-        # itself it built against it and we need both to match.
         brew cat ${formula} | \
-          sed '/^[[:blank:]]*def install$/i\'$'\n  depends_on "libiconv"\n' | \
           sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["MACOSX_DEPLOYMENT_TARGET"] = "'${MACOSX_DEPLOYMENT_TARGET}$'"\n' | \
           sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["CC"] = "/usr/bin/clang"\n' | \
           sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["CFLAGS"] = "-arch x86_64 -arch arm64"\n' | \
           sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["LDFLAGS"] = "-arch x86_64 -arch arm64"\n' >${formula}.rb
 
+        if [[ "${{ inputs.gnuiconv }}" == "true" ]]; then
+          # We also manually depend on GNU libiconv as Apple iconv is broken since macOS 14. This is necessary as MacVim
+          # itself it built against it and we need both to match.
+          sed -i.bak '/^[[:blank:]]*def install$/i\'$'\n  depends_on "libiconv"\n' ${formula}.rb
+        fi
+
         # Homebrew requires formula files to be placed in taps and disallows
         # installing from raw paths, so we manually create a taps folder for a
         # 'macvim-dev/deps' tap.
@@ -90,7 +95,9 @@ runs:
         brew list ${formula} &>/dev/null || brew install --quiet --formula -s macvim-dev/deps/${formula}
 
         # If formula was cached, this step is necessary to relink it to brew prefix (e.g. /usr/local)
-        brew unlink ${formula} && brew link ${formula}
+        # The "-f" is there to force link keg-only formulas. Homebrew doesn't provide a command to just link in the
+        # optional /opt/homebrew/opt/... folders, so we have to resort to doing this.
+        brew unlink ${formula} && brew link -f ${formula}
         echo '::endgroup::'
 
         echo '::group::Verify built version'

.github/workflows/macvim-buildtest.yaml

@@ -89,6 +89,15 @@ jobs:
           xcode-select -p
           xcodebuild -version
 
+      # Set up, install, and cache libiconv library to work around broken Apple iconv since macOS 14.
+
+      - name: Set up libiconv
+        if: inputs.publish
+        uses: ./.github/actions/universal-package
+        with:
+          formula: libiconv
+          contents: opt/libiconv/lib/libiconv.a,opt/libiconv/lib/libiconv.dylib
+
       # Set up, install, and cache gettext library for localization.
 
       - name: Set up gettext
@@ -97,6 +106,7 @@ jobs:
         with:
           formula: gettext
           contents: lib/libintl.a,lib/libintl.dylib
+          gnuiconv: true
 
       # Set up, install, and cache libsodium library for encryption.
 
@@ -112,7 +122,7 @@ jobs:
       - name: Install packages
         run: |
           # GNU iconv is installed to work around broken Apple iconv
-          brew install --quiet libtool libiconv
+          brew install --quiet libtool
 
       - name: Install packages for testing
         run: |