Commit 6b9133e
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
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
232 | 232 | | |
233 | 233 | | |
234 | 234 | | |
235 | | - | |
236 | | - | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
237 | 239 | | |
238 | 240 | | |
239 | 241 | | |
| |||
284 | 286 | | |
285 | 287 | | |
286 | 288 | | |
287 | | - | |
288 | | - | |
289 | | - | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
290 | 294 | | |
291 | 295 | | |
292 | 296 | | |
| |||
0 commit comments