Skip to content

Commit 6b9133e

Browse files
committed
ci: Fix non-publish builds failing due to failing to use Homebrew iconv
CI builds switched to using Homebrew iconv instead of native one in #1626, but for non-publish builds this assumed libiconv was installed by Homebrew, which wasn't always the case. This led to build failures if Homebrew didn't have it installed. Fix it so that we only use Homebrew libiconv in publish builds and use Apple iconv otherwise. This also helps test that both versions work correctly in CI.
1 parent 5ef4a1f commit 6b9133e

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

.github/workflows/macvim-buildtest.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,10 @@ jobs:
232232
sed -i.bak -f ci/config.mk.optimized.sed src/auto/config.mk
233233
fi
234234
235-
# Use Homebrew GNU libiconv since Apple iconv has been broken since macOS 14
236-
sed -i.bak -f ci/config.mk.brew-libiconv.sed src/auto/config.mk
235+
if ${{ inputs.publish == true }}; then
236+
# Use Homebrew GNU libiconv since Apple iconv has been broken since macOS 14
237+
sed -i.bak -f ci/config.mk.brew-libiconv.sed src/auto/config.mk
238+
fi
237239
238240
- name: Modify configure result
239241
if: inputs.publish
@@ -284,9 +286,11 @@ jobs:
284286
echo 'Found external dynamic linkage!'; false
285287
fi
286288
287-
# Make sure we are not using system iconv, which has been buggy since macOS 14.
288-
if otool -L ${VIM_BIN} | grep '^\s*/usr/lib/libiconv'; then
289-
echo 'Using system iconv! We should be linking against GNU iconv instead.'; false
289+
if ${{ inputs.publish == true }}; then
290+
# Make sure we are not using system iconv, which has been buggy since macOS 14.
291+
if otool -L ${VIM_BIN} | grep '^\s*/usr/lib/libiconv'; then
292+
echo 'Using system iconv! We should be linking against GNU iconv instead.'; false
293+
fi
290294
fi
291295
292296
# Make sure that --disable-sparkle flag will properly exclude all references to Sparkle symbols. This is

0 commit comments

Comments
 (0)