Test CirrusCI with updated superstring [DO NOT MERGE]

.cirrus.yml

@@ -121,7 +121,7 @@ arm_linux_task:
 
 silicon_mac_task:
   alias: mac
-  only_if: $CIRRUS_CRON != "" || $CIRRUS_TAG != ""
+  # only_if: $CIRRUS_CRON != "" || $CIRRUS_TAG != ""
   skip: $CIRRUS_CHANGE_IN_REPO == $CIRRUS_LAST_GREEN_CHANGE
   macos_instance:
     image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
@@ -151,13 +151,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"
+    # - 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"
+    # - 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:

.github/workflows/build.yml

@@ -100,6 +100,13 @@ jobs:
       # for this issue. At that point this additional step can be removed.
       run: npx node-gyp install ${{ env.NODE_VERSION }}
 
+    - name: Install GNU libiconv (macOS)
+      if: ${{ runner.os == 'macOS' }}
+      # Now that macOS ships with FreeBSD's version of libiconv, we need to
+      # download the GNU version from Homebrew. `superstring` will detect its
+      # presence and use it when compiling.
+      run: brew install libiconv
+
     - name: Install Pulsar Dependencies
       uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e
       with:

.github/workflows/editor-tests.yml

@@ -28,6 +28,10 @@ jobs:
       with:
         node-version: 16
 
+    - name: Install libiconv
+      if: runner.os != 'Linux'
+      run: brew install libiconv
+
     - name: Install Python setuptools
       # This is needed for Python 3.12+, since many versions of node-gyp
       # are incompatible with Python 3.12+, which no-longer ships 'distutils'

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": "https://github.com/savetheclocktower/superstring.git#ab97b546fc6064f406820a29b0208ede5dbfa664",
+    "text-buffer/superstring": "https://github.com/savetheclocktower/superstring.git#ab97b546fc6064f406820a29b0208ede5dbfa664"
   },
   "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": "https://github.com/savetheclocktower/superstring.git#ab97b546fc6064f406820a29b0208ede5dbfa664",
     "symbol-provider-ctags": "file:./packages/symbol-provider-ctags",
     "symbol-provider-tree-sitter": "file:./packages/symbol-provider-tree-sitter",
     "symbols-view": "file:./packages/symbols-view",

yarn.lock

@@ -9027,10 +9027,10 @@ superagent@^8.0.9:
     qs "^6.11.0"
     semver "^7.3.8"
 
-superstring@^2.4.4:
+superstring@^2.4.4, "superstring@https://github.com/savetheclocktower/superstring.git#ab97b546fc6064f406820a29b0208ede5dbfa664":
   version "2.4.4"
-  resolved "https://registry.yarnpkg.com/superstring/-/superstring-2.4.4.tgz#d5df5b080deb5605ffd88b6cdbaf17a0b30d5f0e"
-  integrity sha512-41LWIGzy6tkUM6jUwbXTeGOLui3gGBxgV6m8gIWRzv1WdW0HV6oANHdGanRrM04mwFXXExII9OQ/XxaqU+Ft9w==
+  uid "ab97b546fc6064f406820a29b0208ede5dbfa664"
+  resolved "https://github.com/savetheclocktower/superstring.git#ab97b546fc6064f406820a29b0208ede5dbfa664"
   dependencies:
     nan "^2.14.2"