From 34d8d8ad641ee2089f0cbc2d4453808c41772b61 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Tue, 2 Jul 2024 17:10:15 -0500 Subject: [PATCH 01/16] Test CirrusCI with updated `superstring` --- .cirrus.yml | 10 +++++----- package.json | 6 ++++-- yarn.lock | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 97ce074b4e..e5ecb07b14 100644 --- a/.cirrus.yml +++ b/.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: diff --git a/package.json b/package.json index 6314509242..20bf0d2545 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": "https://github.com/savetheclocktower/superstring.git#9466a42018e197668a185b0b456a9e414720b331", + "text-buffer/superstring": "https://github.com/savetheclocktower/superstring.git#9466a42018e197668a185b0b456a9e414720b331" }, "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#9466a42018e197668a185b0b456a9e414720b331", "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 fbe83b6209..011cfd179e 100644 --- a/yarn.lock +++ b/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#9466a42018e197668a185b0b456a9e414720b331": version "2.4.4" - resolved "https://registry.yarnpkg.com/superstring/-/superstring-2.4.4.tgz#d5df5b080deb5605ffd88b6cdbaf17a0b30d5f0e" - integrity sha512-41LWIGzy6tkUM6jUwbXTeGOLui3gGBxgV6m8gIWRzv1WdW0HV6oANHdGanRrM04mwFXXExII9OQ/XxaqU+Ft9w== + uid "9466a42018e197668a185b0b456a9e414720b331" + resolved "https://github.com/savetheclocktower/superstring.git#9466a42018e197668a185b0b456a9e414720b331" dependencies: nan "^2.14.2" From bd6c192fa0aa5cf50cf38f8d3aa57c218f0e2a45 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Tue, 2 Jul 2024 17:36:38 -0500 Subject: [PATCH 02/16] Bump --- package.json | 6 +++--- yarn.lock | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 20bf0d2545..84239cadf1 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": "https://github.com/savetheclocktower/superstring.git#9466a42018e197668a185b0b456a9e414720b331", - "text-buffer/superstring": "https://github.com/savetheclocktower/superstring.git#9466a42018e197668a185b0b456a9e414720b331" + "superstring": "https://github.com/savetheclocktower/superstring.git#6f2232cc14b9c3de9357c2d51273f909e1dd1881", + "text-buffer/superstring": "https://github.com/savetheclocktower/superstring.git#6f2232cc14b9c3de9357c2d51273f909e1dd1881" }, "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": "https://github.com/savetheclocktower/superstring.git#9466a42018e197668a185b0b456a9e414720b331", + "superstring": "https://github.com/savetheclocktower/superstring.git#6f2232cc14b9c3de9357c2d51273f909e1dd1881", "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 011cfd179e..71e3807e2b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9027,10 +9027,10 @@ superagent@^8.0.9: qs "^6.11.0" semver "^7.3.8" -superstring@^2.4.4, "superstring@https://github.com/savetheclocktower/superstring.git#9466a42018e197668a185b0b456a9e414720b331": +superstring@^2.4.4, "superstring@https://github.com/savetheclocktower/superstring.git#6f2232cc14b9c3de9357c2d51273f909e1dd1881": version "2.4.4" - uid "9466a42018e197668a185b0b456a9e414720b331" - resolved "https://github.com/savetheclocktower/superstring.git#9466a42018e197668a185b0b456a9e414720b331" + uid "6f2232cc14b9c3de9357c2d51273f909e1dd1881" + resolved "https://github.com/savetheclocktower/superstring.git#6f2232cc14b9c3de9357c2d51273f909e1dd1881" dependencies: nan "^2.14.2" From 6321bb88212a35e0c8c3496d1b1214e4797e19b7 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Tue, 2 Jul 2024 18:14:37 -0500 Subject: [PATCH 03/16] =?UTF-8?q?Attempt=20to=20use=20Homebrew=E2=80=99s?= =?UTF-8?q?=20`libiconv`=20to=20build=20Intel=20Mac=20binaries?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d7718e8b7a..210bf408fd 100644 --- a/.github/workflows/build.yml +++ b/.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: From 4d50397ad997f346aeeb1ff8a1c01b34b3028c2f Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Wed, 3 Jul 2024 09:15:20 -0500 Subject: [PATCH 04/16] Install `libiconv` for the editor tests as well --- .github/workflows/editor-tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/editor-tests.yml b/.github/workflows/editor-tests.yml index c40264941f..ea79ca575b 100644 --- a/.github/workflows/editor-tests.yml +++ b/.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' From 9715d64a58d892bcfab6c4aea6c35233bc5f4a08 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Wed, 3 Jul 2024 10:38:51 -0500 Subject: [PATCH 05/16] Experiment: adopt encoding name fix --- package.json | 6 +++--- yarn.lock | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 84239cadf1..8684c1d5f3 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": "https://github.com/savetheclocktower/superstring.git#6f2232cc14b9c3de9357c2d51273f909e1dd1881", - "text-buffer/superstring": "https://github.com/savetheclocktower/superstring.git#6f2232cc14b9c3de9357c2d51273f909e1dd1881" + "superstring": "https://github.com/savetheclocktower/superstring.git#873a2ea88d9f699ba1767636c548ceb58e5715cc", + "text-buffer/superstring": "https://github.com/savetheclocktower/superstring.git#873a2ea88d9f699ba1767636c548ceb58e5715cc" }, "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": "https://github.com/savetheclocktower/superstring.git#6f2232cc14b9c3de9357c2d51273f909e1dd1881", + "superstring": "https://github.com/savetheclocktower/superstring.git#873a2ea88d9f699ba1767636c548ceb58e5715cc", "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 71e3807e2b..c36026d892 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9027,10 +9027,10 @@ superagent@^8.0.9: qs "^6.11.0" semver "^7.3.8" -superstring@^2.4.4, "superstring@https://github.com/savetheclocktower/superstring.git#6f2232cc14b9c3de9357c2d51273f909e1dd1881": +superstring@^2.4.4, "superstring@https://github.com/savetheclocktower/superstring.git#873a2ea88d9f699ba1767636c548ceb58e5715cc": version "2.4.4" - uid "6f2232cc14b9c3de9357c2d51273f909e1dd1881" - resolved "https://github.com/savetheclocktower/superstring.git#6f2232cc14b9c3de9357c2d51273f909e1dd1881" + uid "873a2ea88d9f699ba1767636c548ceb58e5715cc" + resolved "https://github.com/savetheclocktower/superstring.git#873a2ea88d9f699ba1767636c548ceb58e5715cc" dependencies: nan "^2.14.2" From c7f7677a092c8c29beb2223fb3735773881c42a1 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Wed, 3 Jul 2024 11:39:12 -0500 Subject: [PATCH 06/16] Experient: Revert Node API changes in superstring --- package.json | 6 +++--- yarn.lock | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 8684c1d5f3..84cb249b96 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": "https://github.com/savetheclocktower/superstring.git#873a2ea88d9f699ba1767636c548ceb58e5715cc", - "text-buffer/superstring": "https://github.com/savetheclocktower/superstring.git#873a2ea88d9f699ba1767636c548ceb58e5715cc" + "superstring": "https://github.com/savetheclocktower/superstring.git#3175c946282943411605daaa65dc2b5a8d6a145a", + "text-buffer/superstring": "https://github.com/savetheclocktower/superstring.git#3175c946282943411605daaa65dc2b5a8d6a145a" }, "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": "https://github.com/savetheclocktower/superstring.git#873a2ea88d9f699ba1767636c548ceb58e5715cc", + "superstring": "https://github.com/savetheclocktower/superstring.git#3175c946282943411605daaa65dc2b5a8d6a145a", "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 c36026d892..89fd4bbc56 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9027,10 +9027,10 @@ superagent@^8.0.9: qs "^6.11.0" semver "^7.3.8" -superstring@^2.4.4, "superstring@https://github.com/savetheclocktower/superstring.git#873a2ea88d9f699ba1767636c548ceb58e5715cc": +superstring@^2.4.4, "superstring@https://github.com/savetheclocktower/superstring.git#3175c946282943411605daaa65dc2b5a8d6a145a": version "2.4.4" - uid "873a2ea88d9f699ba1767636c548ceb58e5715cc" - resolved "https://github.com/savetheclocktower/superstring.git#873a2ea88d9f699ba1767636c548ceb58e5715cc" + uid "3175c946282943411605daaa65dc2b5a8d6a145a" + resolved "https://github.com/savetheclocktower/superstring.git#3175c946282943411605daaa65dc2b5a8d6a145a" dependencies: nan "^2.14.2" From 521da3c986e9a70ddffac993dd44841b6b690c10 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Wed, 3 Jul 2024 13:17:18 -0500 Subject: [PATCH 07/16] Experiment: Build specifically against `libiconv` 61 from Apple's repo --- package.json | 6 +++--- yarn.lock | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 84cb249b96..ac94a92105 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": "https://github.com/savetheclocktower/superstring.git#3175c946282943411605daaa65dc2b5a8d6a145a", - "text-buffer/superstring": "https://github.com/savetheclocktower/superstring.git#3175c946282943411605daaa65dc2b5a8d6a145a" + "superstring": "https://github.com/savetheclocktower/superstring.git#1171e881619a2b4a5a4b20f47a9b66285b54bf24", + "text-buffer/superstring": "https://github.com/savetheclocktower/superstring.git#1171e881619a2b4a5a4b20f47a9b66285b54bf24" }, "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": "https://github.com/savetheclocktower/superstring.git#3175c946282943411605daaa65dc2b5a8d6a145a", + "superstring": "https://github.com/savetheclocktower/superstring.git#1171e881619a2b4a5a4b20f47a9b66285b54bf24", "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 89fd4bbc56..c756d7e7bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9027,10 +9027,10 @@ superagent@^8.0.9: qs "^6.11.0" semver "^7.3.8" -superstring@^2.4.4, "superstring@https://github.com/savetheclocktower/superstring.git#3175c946282943411605daaa65dc2b5a8d6a145a": +superstring@^2.4.4, "superstring@https://github.com/savetheclocktower/superstring.git#1171e881619a2b4a5a4b20f47a9b66285b54bf24": version "2.4.4" - uid "3175c946282943411605daaa65dc2b5a8d6a145a" - resolved "https://github.com/savetheclocktower/superstring.git#3175c946282943411605daaa65dc2b5a8d6a145a" + uid "1171e881619a2b4a5a4b20f47a9b66285b54bf24" + resolved "https://github.com/savetheclocktower/superstring.git#1171e881619a2b4a5a4b20f47a9b66285b54bf24" dependencies: nan "^2.14.2" From f0d753d20b66360eecd9255336c9d11718e09d49 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Wed, 3 Jul 2024 13:30:04 -0500 Subject: [PATCH 08/16] Bump to fix error --- package.json | 6 +++--- yarn.lock | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index ac94a92105..19862c6ecc 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": "https://github.com/savetheclocktower/superstring.git#1171e881619a2b4a5a4b20f47a9b66285b54bf24", - "text-buffer/superstring": "https://github.com/savetheclocktower/superstring.git#1171e881619a2b4a5a4b20f47a9b66285b54bf24" + "superstring": "https://github.com/savetheclocktower/superstring.git#77b9a673c969e935aeac977d9debb7566011921c", + "text-buffer/superstring": "https://github.com/savetheclocktower/superstring.git#77b9a673c969e935aeac977d9debb7566011921c" }, "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": "https://github.com/savetheclocktower/superstring.git#1171e881619a2b4a5a4b20f47a9b66285b54bf24", + "superstring": "https://github.com/savetheclocktower/superstring.git#77b9a673c969e935aeac977d9debb7566011921c", "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 c756d7e7bb..9d74ac8179 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9027,10 +9027,10 @@ superagent@^8.0.9: qs "^6.11.0" semver "^7.3.8" -superstring@^2.4.4, "superstring@https://github.com/savetheclocktower/superstring.git#1171e881619a2b4a5a4b20f47a9b66285b54bf24": +superstring@^2.4.4, "superstring@https://github.com/savetheclocktower/superstring.git#77b9a673c969e935aeac977d9debb7566011921c": version "2.4.4" - uid "1171e881619a2b4a5a4b20f47a9b66285b54bf24" - resolved "https://github.com/savetheclocktower/superstring.git#1171e881619a2b4a5a4b20f47a9b66285b54bf24" + uid "77b9a673c969e935aeac977d9debb7566011921c" + resolved "https://github.com/savetheclocktower/superstring.git#77b9a673c969e935aeac977d9debb7566011921c" dependencies: nan "^2.14.2" From 74634918d6ae455742d1db40db78eb8bbef24ba6 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Wed, 3 Jul 2024 14:14:11 -0500 Subject: [PATCH 09/16] Stop triggering CirrusCI jobs for now --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index e5ecb07b14..aaa30615d3 100644 --- a/.cirrus.yml +++ b/.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 From 3b3f51b789ed6c69d3df7532f25fed3c453eaded Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Wed, 3 Jul 2024 14:40:43 -0500 Subject: [PATCH 10/16] Build on known good `superstring` version --- package.json | 6 +++--- yarn.lock | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 19862c6ecc..33a77f83ff 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": "https://github.com/savetheclocktower/superstring.git#77b9a673c969e935aeac977d9debb7566011921c", - "text-buffer/superstring": "https://github.com/savetheclocktower/superstring.git#77b9a673c969e935aeac977d9debb7566011921c" + "superstring": "https://github.com/savetheclocktower/superstring.git#5343002a4c89fd08c78a1255882f51178aa0a98f", + "text-buffer/superstring": "https://github.com/savetheclocktower/superstring.git#5343002a4c89fd08c78a1255882f51178aa0a98f" }, "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": "https://github.com/savetheclocktower/superstring.git#77b9a673c969e935aeac977d9debb7566011921c", + "superstring": "https://github.com/savetheclocktower/superstring.git#5343002a4c89fd08c78a1255882f51178aa0a98f", "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 9d74ac8179..fbc189bc42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9027,10 +9027,10 @@ superagent@^8.0.9: qs "^6.11.0" semver "^7.3.8" -superstring@^2.4.4, "superstring@https://github.com/savetheclocktower/superstring.git#77b9a673c969e935aeac977d9debb7566011921c": +superstring@^2.4.4, "superstring@https://github.com/savetheclocktower/superstring.git#5343002a4c89fd08c78a1255882f51178aa0a98f": version "2.4.4" - uid "77b9a673c969e935aeac977d9debb7566011921c" - resolved "https://github.com/savetheclocktower/superstring.git#77b9a673c969e935aeac977d9debb7566011921c" + uid "5343002a4c89fd08c78a1255882f51178aa0a98f" + resolved "https://github.com/savetheclocktower/superstring.git#5343002a4c89fd08c78a1255882f51178aa0a98f" dependencies: nan "^2.14.2" From 910819e182f8ae013d029a9a9188fd9dca5f9aa2 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Wed, 3 Jul 2024 15:18:56 -0500 Subject: [PATCH 11/16] =?UTF-8?q?Build=20on=20a=20=E2=80=9Ccandidate?= =?UTF-8?q?=E2=80=9D=20`superstring`=20branch=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …and enable CirrusCI for one more job. --- .cirrus.yml | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index aaa30615d3..e5ecb07b14 100644 --- a/.cirrus.yml +++ b/.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 diff --git a/yarn.lock b/yarn.lock index fbc189bc42..cc0accdea2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9027,10 +9027,10 @@ superagent@^8.0.9: qs "^6.11.0" semver "^7.3.8" -superstring@^2.4.4, "superstring@https://github.com/savetheclocktower/superstring.git#5343002a4c89fd08c78a1255882f51178aa0a98f": +superstring@^2.4.4, "superstring@https://github.com/savetheclocktower/superstring.git#037a69874f2107c401a324cc1051eac4be0deef4": version "2.4.4" - uid "5343002a4c89fd08c78a1255882f51178aa0a98f" - resolved "https://github.com/savetheclocktower/superstring.git#5343002a4c89fd08c78a1255882f51178aa0a98f" + uid "037a69874f2107c401a324cc1051eac4be0deef4" + resolved "https://github.com/savetheclocktower/superstring.git#037a69874f2107c401a324cc1051eac4be0deef4" dependencies: nan "^2.14.2" From 855aa29bced3d76654876ae2491bc85636f43f6f Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Thu, 4 Jul 2024 23:58:58 -0500 Subject: [PATCH 12/16] (Forgot to update `package.json`?) --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 33a77f83ff..7a30e8375a 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": "https://github.com/savetheclocktower/superstring.git#5343002a4c89fd08c78a1255882f51178aa0a98f", - "text-buffer/superstring": "https://github.com/savetheclocktower/superstring.git#5343002a4c89fd08c78a1255882f51178aa0a98f" + "superstring": "https://github.com/savetheclocktower/superstring.git#037a69874f2107c401a324cc1051eac4be0deef4", + "text-buffer/superstring": "https://github.com/savetheclocktower/superstring.git#037a69874f2107c401a324cc1051eac4be0deef4" }, "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": "https://github.com/savetheclocktower/superstring.git#5343002a4c89fd08c78a1255882f51178aa0a98f", + "superstring": "https://github.com/savetheclocktower/superstring.git#037a69874f2107c401a324cc1051eac4be0deef4", "symbol-provider-ctags": "file:./packages/symbol-provider-ctags", "symbol-provider-tree-sitter": "file:./packages/symbol-provider-tree-sitter", "symbols-view": "file:./packages/symbols-view", From 8e847c4223e8e48d80842deea89d5f09bd09e4c5 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Fri, 5 Jul 2024 12:31:35 -0500 Subject: [PATCH 13/16] Debug binary building (temporary CI change) --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 210bf408fd..d90c5a91a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -137,7 +137,7 @@ jobs: # macOS Signing Stuff - name: Build Pulsar Binaries (macOS) (Signed) - if: ${{ runner.os == 'macOS' && github.event_name == 'push' }} + if: ${{ runner.os == 'macOS' && github.event_name != 'push' }} # Note: PRs generated from forks cannot access GitHub Secrets. # So if the PR is from a fork, we can still build, but cannot sign. # Note: We aren't attempting to sign for *any* PRs anymore, though. @@ -155,7 +155,7 @@ jobs: command: yarn dist - name: Build Pulsar Binaries (macOS) (Unsigned) - if: ${{ runner.os == 'macOS' && github.event_name != 'push' }} + if: ${{ runner.os == 'macOS' && github.event_name == 'push' }} uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e with: timeout_minutes: 45 From 196767f3af62c754a9cfd386795a383507201032 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Fri, 5 Jul 2024 12:31:58 -0500 Subject: [PATCH 14/16] Skip silicon jobs again --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index e5ecb07b14..aaa30615d3 100644 --- a/.cirrus.yml +++ b/.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 From 5da502536c5b53b5accd7e223d627be3a9e0dbb5 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Fri, 5 Jul 2024 14:22:58 -0500 Subject: [PATCH 15/16] Bump `superstring` again --- package.json | 6 +++--- yarn.lock | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7a30e8375a..fd954e3c0e 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": "https://github.com/savetheclocktower/superstring.git#037a69874f2107c401a324cc1051eac4be0deef4", - "text-buffer/superstring": "https://github.com/savetheclocktower/superstring.git#037a69874f2107c401a324cc1051eac4be0deef4" + "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", @@ -167,7 +167,7 @@ "spell-check": "file:packages/spell-check", "status-bar": "file:packages/status-bar", "styleguide": "file:./packages/styleguide", - "superstring": "https://github.com/savetheclocktower/superstring.git#037a69874f2107c401a324cc1051eac4be0deef4", + "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", diff --git a/yarn.lock b/yarn.lock index cc0accdea2..d543ade80a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9027,10 +9027,10 @@ superagent@^8.0.9: qs "^6.11.0" semver "^7.3.8" -superstring@^2.4.4, "superstring@https://github.com/savetheclocktower/superstring.git#037a69874f2107c401a324cc1051eac4be0deef4": +superstring@^2.4.4, "superstring@https://github.com/savetheclocktower/superstring.git#ab97b546fc6064f406820a29b0208ede5dbfa664": version "2.4.4" - uid "037a69874f2107c401a324cc1051eac4be0deef4" - resolved "https://github.com/savetheclocktower/superstring.git#037a69874f2107c401a324cc1051eac4be0deef4" + uid "ab97b546fc6064f406820a29b0208ede5dbfa664" + resolved "https://github.com/savetheclocktower/superstring.git#ab97b546fc6064f406820a29b0208ede5dbfa664" dependencies: nan "^2.14.2" From b1aaf9e4a3c75c1c98a147f6d398fc02e56fda6f Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Fri, 5 Jul 2024 16:41:46 -0500 Subject: [PATCH 16/16] =?UTF-8?q?Revert=20to=20ordinary=20binary-building?= =?UTF-8?q?=20behavior=20on=20Intel=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …and trigger an Apple Silicon binary (now that we seem to have figured this out) --- .cirrus.yml | 2 +- .github/workflows/build.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index aaa30615d3..e5ecb07b14 100644 --- a/.cirrus.yml +++ b/.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 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d90c5a91a5..210bf408fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -137,7 +137,7 @@ jobs: # macOS Signing Stuff - name: Build Pulsar Binaries (macOS) (Signed) - if: ${{ runner.os == 'macOS' && github.event_name != 'push' }} + if: ${{ runner.os == 'macOS' && github.event_name == 'push' }} # Note: PRs generated from forks cannot access GitHub Secrets. # So if the PR is from a fork, we can still build, but cannot sign. # Note: We aren't attempting to sign for *any* PRs anymore, though. @@ -155,7 +155,7 @@ jobs: command: yarn dist - name: Build Pulsar Binaries (macOS) (Unsigned) - if: ${{ runner.os == 'macOS' && github.event_name == 'push' }} + if: ${{ runner.os == 'macOS' && github.event_name != 'push' }} uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e with: timeout_minutes: 45