From 0ee4954d081c3cf68a7535cd8f529a60ef3628ab Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Sat, 6 Jul 2024 19:38:55 -0500 Subject: [PATCH 1/3] =?UTF-8?q?Update=20`superstring`=20to=20use=20the=20`?= =?UTF-8?q?pulsar-edit`=20fork=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …so that it uses a vendorized `libiconv` on macOS. --- package.json | 6 ++++-- yarn.lock | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 631450924..2672cee15 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,9 @@ "license": "MIT", "electronVersion": "12.2.3", "resolutions": { - "es5-ext": "https://github.com/pulsar-edit/es5-ext#169f6ae9b2675675269a0ba265f83c29c7b56244" + "es5-ext": "https://github.com/pulsar-edit/es5-ext#169f6ae9b2675675269a0ba265f83c29c7b56244", + "superstring": "github:pulsar-edit/superstring", + "text-buffer/superstring": "github:pulsar-edit/superstring" }, "dependencies": { "@atom/source-map-support": "^0.3.4", @@ -165,7 +167,7 @@ "spell-check": "file:packages/spell-check", "status-bar": "file:packages/status-bar", "styleguide": "file:./packages/styleguide", - "superstring": "^2.4.4", + "superstring": "github:pulsar-edit/superstring", "symbol-provider-ctags": "file:./packages/symbol-provider-ctags", "symbol-provider-tree-sitter": "file:./packages/symbol-provider-tree-sitter", "symbols-view": "file:./packages/symbols-view", diff --git a/yarn.lock b/yarn.lock index fbe83b620..21c748c29 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9027,10 +9027,9 @@ superagent@^8.0.9: qs "^6.11.0" semver "^7.3.8" -superstring@^2.4.4: +superstring@^2.4.4, "superstring@github:pulsar-edit/superstring": version "2.4.4" - resolved "https://registry.yarnpkg.com/superstring/-/superstring-2.4.4.tgz#d5df5b080deb5605ffd88b6cdbaf17a0b30d5f0e" - integrity sha512-41LWIGzy6tkUM6jUwbXTeGOLui3gGBxgV6m8gIWRzv1WdW0HV6oANHdGanRrM04mwFXXExII9OQ/XxaqU+Ft9w== + resolved "https://codeload.github.com/pulsar-edit/superstring/tar.gz/de97b496663fce40050bf2d66e1466ccfbd00943" dependencies: nan "^2.14.2" From 410e5003f6749d9f196d2887da29cdfb8bd41c91 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Sat, 6 Jul 2024 19:40:32 -0500 Subject: [PATCH 2/3] Skip unnecessary steps when building Silicon macOS binaries in CI --- .cirrus.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 97ce074b4..b45846d72 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -137,7 +137,6 @@ 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 @@ -151,13 +150,9 @@ 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 82dbfd6e4cbcdfe664c69f45969358ccd6340dab Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Sat, 6 Jul 2024 20:56:21 -0500 Subject: [PATCH 3/3] Address PR feedback --- package.json | 6 +++--- yarn.lock | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 2672cee15..7fd36a02d 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,8 @@ "electronVersion": "12.2.3", "resolutions": { "es5-ext": "https://github.com/pulsar-edit/es5-ext#169f6ae9b2675675269a0ba265f83c29c7b56244", - "superstring": "github:pulsar-edit/superstring", - "text-buffer/superstring": "github:pulsar-edit/superstring" + "superstring": "github:pulsar-edit/superstring#de97b496663fce40050bf2d66e1466ccfbd00943", + "text-buffer/superstring": "github:pulsar-edit/superstring#de97b496663fce40050bf2d66e1466ccfbd00943" }, "dependencies": { "@atom/source-map-support": "^0.3.4", @@ -167,7 +167,7 @@ "spell-check": "file:packages/spell-check", "status-bar": "file:packages/status-bar", "styleguide": "file:./packages/styleguide", - "superstring": "github:pulsar-edit/superstring", + "superstring": "github:pulsar-edit/superstring#de97b496663fce40050bf2d66e1466ccfbd00943", "symbol-provider-ctags": "file:./packages/symbol-provider-ctags", "symbol-provider-tree-sitter": "file:./packages/symbol-provider-tree-sitter", "symbols-view": "file:./packages/symbols-view", diff --git a/yarn.lock b/yarn.lock index 21c748c29..4505c010e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9027,7 +9027,7 @@ superagent@^8.0.9: qs "^6.11.0" semver "^7.3.8" -superstring@^2.4.4, "superstring@github:pulsar-edit/superstring": +superstring@^2.4.4, "superstring@github:pulsar-edit/superstring#de97b496663fce40050bf2d66e1466ccfbd00943": version "2.4.4" resolved "https://codeload.github.com/pulsar-edit/superstring/tar.gz/de97b496663fce40050bf2d66e1466ccfbd00943" dependencies: