From 274000f0a07f816ef08b0ec4295fb6c739385819 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Thu, 27 Jun 2024 22:43:53 -0700 Subject: [PATCH 1/2] =?UTF-8?q?Link=20to=20Homebrew=20version=20of=20`libi?= =?UTF-8?q?conv`=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …to work around incompatible version of `libiconv` bundled with newer versions of XCode. --- .cirrus.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index b45846d72..c3f2d91a8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -137,10 +137,13 @@ silicon_mac_task: - brew update - brew uninstall node@20 - brew install git python@$PYTHON_VERSION python-setuptools + - brew install libiconv - git submodule init - git submodule update - ln -s /opt/homebrew/bin/python$PYTHON_VERSION /opt/homebrew/bin/python - export PATH="/opt/homebrew/bin:$PATH" + - export LDFLAGS="-L$(brew --prefix)/opt/libiconv/lib" + - export CPPFLAGS="-I$(brew --prefix)/opt/libiconv/include" - mkdir tj_n && cd tj_n - curl -L https://github.com/tj/n/archive/0ce85771fdff8f4b3e09ade700461b4f58a64444.tar.gz -O - tar xf 0ce85771fdff8f4b3e09ade700461b4f58a64444.tar.gz @@ -150,9 +153,13 @@ silicon_mac_task: - sed -i -e "s/[0-9]*-dev/`date -u +%Y%m%d%H`/g" package.json install_script: - export PATH="/opt/homebrew/bin:$PATH" + - export LDFLAGS="-L$(brew --prefix)/opt/libiconv/lib" + - export CPPFLAGS="-I$(brew --prefix)/opt/libiconv/include" - yarn install --ignore-engines || yarn install --ignore-engines build_script: - export PATH="/opt/homebrew/bin:$PATH" + - export LDFLAGS="-L$(brew --prefix)/opt/libiconv/lib" + - export CPPFLAGS="-I$(brew --prefix)/opt/libiconv/include" - yarn build - yarn run build:apm build_binary_script: From 7dcd838645b1e5f7e20c667d9bdfa4d81988b423 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Thu, 27 Jun 2024 23:05:53 -0700 Subject: [PATCH 2/2] Don't need this in the `prepare_script` step --- .cirrus.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index c3f2d91a8..97ce074b4 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -142,8 +142,6 @@ silicon_mac_task: - git submodule update - ln -s /opt/homebrew/bin/python$PYTHON_VERSION /opt/homebrew/bin/python - export PATH="/opt/homebrew/bin:$PATH" - - export LDFLAGS="-L$(brew --prefix)/opt/libiconv/lib" - - export CPPFLAGS="-I$(brew --prefix)/opt/libiconv/include" - mkdir tj_n && cd tj_n - curl -L https://github.com/tj/n/archive/0ce85771fdff8f4b3e09ade700461b4f58a64444.tar.gz -O - tar xf 0ce85771fdff8f4b3e09ade700461b4f58a64444.tar.gz