From c4cd192ab5a65ef5c32d2f99df899b51a6a7fd7d Mon Sep 17 00:00:00 2001 From: VerteDinde Date: Mon, 1 May 2023 19:57:15 -0700 Subject: [PATCH 01/15] build: init commit, debugging build --- .circleci/config.yml | 14 ++++++++------ forge.config.js | 12 ++++++++++++ package.json | 1 + yarn.lock | 30 ++++++++++++++++++++++++++++-- 4 files changed, 49 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cca56c3e4a..cefc56189c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -121,6 +121,8 @@ jobs: - image: cimg/base:stable steps: - run: sudo apt-get update && sudo apt install rpm + - run: sudo snap install snapd + - run: sudo snap install snapcraft --classic - install - run: npx yarn run publish --arch=<< parameters.arch >> --dry-run # CircleCI doesn't let you persist files with the same name from multiple @@ -209,12 +211,12 @@ workflows: matrix: parameters: arch: [ x64, arm64, armv7l ] - filters: - tags: - only: - - /^v.*/ - branches: - ignore: /.*/ + # filters: + # tags: + # only: + # - /^v.*/ + # branches: + # ignore: /.*/ - publish-to-github: context: fiddle-release requires: diff --git a/forge.config.js b/forge.config.js index 029fdfd04e..0e848eebd9 100644 --- a/forge.config.js +++ b/forge.config.js @@ -134,6 +134,18 @@ const config = { platforms: ['linux'], config: commonLinuxConfig, }, + { + name: '@electron-forge/maker-snap', + platforms: ['linux'], + config: { + ...commonLinuxConfig, + features: { + audio: true, + video: true, + webgl: true, + }, + }, + }, ], publishers: [ { diff --git a/package.json b/package.json index 9eb5c9cf5b..057c53f9ea 100644 --- a/package.json +++ b/package.json @@ -72,6 +72,7 @@ "@babel/core": "^7.13.8", "@electron-forge/cli": "^6.1.1", "@electron-forge/maker-deb": "^6.1.1", + "@electron-forge/maker-snap": "^6.1.1", "@electron-forge/maker-rpm": "^6.1.1", "@electron-forge/maker-squirrel": "^6.1.1", "@electron-forge/maker-zip": "^6.1.1", diff --git a/yarn.lock b/yarn.lock index f0a9ccca7f..1832e4719c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -784,6 +784,16 @@ optionalDependencies: electron-installer-redhat "^3.2.0" +"@electron-forge/maker-snap@^6.1.1": + version "6.1.1" + resolved "https://registry.yarnpkg.com/@electron-forge/maker-snap/-/maker-snap-6.1.1.tgz#1e90cd97ed5d1fdf31511082c743f6cd5506336e" + integrity sha512-ZKRvKt/JZMJvaCJ9MYFz6oRCfI4NwQgJ4MhyXiHLdY0E+cqtcWXRclEHdRFNFZcH6T/3F2yAPwP56iCHeYMDkA== + dependencies: + "@electron-forge/maker-base" "6.1.1" + "@electron-forge/shared-types" "6.1.1" + optionalDependencies: + electron-installer-snap "^5.1.0" + "@electron-forge/maker-squirrel@^6.1.1": version "6.1.1" resolved "https://registry.yarnpkg.com/@electron-forge/maker-squirrel/-/maker-squirrel-6.1.1.tgz#34bcaf25f3872d8394826ab9237ad2716111eb06" @@ -4303,6 +4313,22 @@ electron-installer-redhat@^3.2.0: word-wrap "^1.2.3" yargs "^16.0.2" +electron-installer-snap@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/electron-installer-snap/-/electron-installer-snap-5.2.0.tgz#8dd637dc94d4279d790d728b7bdb23fe9415377d" + integrity sha512-SRm7pCpNHMXV545JjScV8fLC9NhFli5r8L8Ju4EHdXwRh76+mwrJoUEDLItixBudZ5Mcgz1SJcDPJfWpEQWX7Q== + dependencies: + "@malept/cross-spawn-promise" "^1.0.0" + debug "^4.3.4" + electron-installer-common "^0.10.2" + fs-extra "^9.0.0" + js-yaml "^3.10.0" + lodash "^4.17.15" + semver "^7.1.1" + tmp-promise "^3.0.2" + which "^2.0.1" + yargs "^16.0.2" + electron-is-dev@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-0.3.0.tgz" @@ -7089,9 +7115,9 @@ jest@^27.5.1: resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.13.1: +js-yaml@^3.10.0, js-yaml@^3.13.1: version "3.14.1" - resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== dependencies: argparse "^1.0.7" From 48c17ee989f95f1873edf7bd49b297fcaf8eed8b Mon Sep 17 00:00:00 2001 From: VerteDinde Date: Mon, 1 May 2023 20:13:09 -0700 Subject: [PATCH 02/15] build: apt install snapd --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cefc56189c..6ccca616c8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -120,8 +120,8 @@ jobs: docker: - image: cimg/base:stable steps: - - run: sudo apt-get update && sudo apt install rpm - - run: sudo snap install snapd + - run: sudo apt-get update && sudo apt install rpm && sudo apt install -y snapd + # - run: sudo snap install snapd - run: sudo snap install snapcraft --classic - install - run: npx yarn run publish --arch=<< parameters.arch >> --dry-run From 62bc0dd1fb3427996061fb31fdc74b870c5d06ef Mon Sep 17 00:00:00 2001 From: VerteDinde Date: Mon, 1 May 2023 20:19:07 -0700 Subject: [PATCH 03/15] build: try docker img ubuntudesktop/gnome-3-38-2004 --- .circleci/config.yml | 53 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ccca616c8..72fab7fefd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -118,11 +118,11 @@ jobs: type: enum enum: [ 'x64', 'arm64','armv7l' ] docker: - - image: cimg/base:stable + - image: ubuntudesktop/gnome-3-38-2004 steps: - - run: sudo apt-get update && sudo apt install rpm && sudo apt install -y snapd + - run: sudo apt-get -y update && sudo apt install -y rpm # - run: sudo snap install snapd - - run: sudo snap install snapcraft --classic + # - run: sudo snap install snapcraft --classic - install - run: npx yarn run publish --arch=<< parameters.arch >> --dry-run # CircleCI doesn't let you persist files with the same name from multiple @@ -175,18 +175,18 @@ workflows: build-and-test: jobs: - lint - - mac-test: - matrix: - parameters: - arch: [ x64, arm64 ] - - win-test: - matrix: - parameters: - arch: [ x64 ] - - linux-test: - matrix: - parameters: - arch: [ x64 ] + # - mac-test: + # matrix: + # parameters: + # arch: [ x64, arm64 ] + # - win-test: + # matrix: + # parameters: + # arch: [ x64 ] + # - linux-test: + # matrix: + # parameters: + # arch: [ x64 ] - mac-build: matrix: parameters: @@ -210,7 +210,8 @@ workflows: - linux-build: matrix: parameters: - arch: [ x64, arm64, armv7l ] + arch: [ x64 ] + # arch: [ x64, arm64, armv7l ] # filters: # tags: # only: @@ -221,17 +222,17 @@ workflows: context: fiddle-release requires: - lint - - mac-test-x64 - - mac-test-arm64 - - win-test-x64 - - linux-test-x64 - - mac-build-x64 - - mac-build-arm64 - - win-build-ia32 - - win-build-x64 + # - mac-test-x64 + # - mac-test-arm64 + # - win-test-x64 + # - linux-test-x64 + # - mac-build-x64 + # - mac-build-arm64 + # - win-build-ia32 + # - win-build-x64 - linux-build-x64 - - linux-build-arm64 - - linux-build-armv7l + # - linux-build-arm64 + # - linux-build-armv7l filters: tags: only: From 695c89c4a4365b90d85a6343b78004c52c16a302 Mon Sep 17 00:00:00 2001 From: VerteDinde Date: Mon, 1 May 2023 20:33:10 -0700 Subject: [PATCH 04/15] build: why is git not on this image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 72fab7fefd..d7b9c02588 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -120,7 +120,7 @@ jobs: docker: - image: ubuntudesktop/gnome-3-38-2004 steps: - - run: sudo apt-get -y update && sudo apt install -y rpm + - run: sudo apt-get -y update && sudo apt-get install -y git && sudo apt install -y rpm # - run: sudo snap install snapd # - run: sudo snap install snapcraft --classic - install From 9a9a873b918b11f0a0f3a49508b043033bcac77b Mon Sep 17 00:00:00 2001 From: VerteDinde Date: Mon, 1 May 2023 20:43:16 -0700 Subject: [PATCH 05/15] build: dependency whack-a-mole --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d7b9c02588..5953943a02 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -120,7 +120,8 @@ jobs: docker: - image: ubuntudesktop/gnome-3-38-2004 steps: - - run: sudo apt-get -y update && sudo apt-get install -y git && sudo apt install -y rpm + - run: sudo apt-get -y update + - run: sudo apt-get install -y git curl dpkg fakeroot rpm # - run: sudo snap install snapd # - run: sudo snap install snapcraft --classic - install From d94d30ea40a1eb53f081bc9993e0faa6867900b4 Mon Sep 17 00:00:00 2001 From: VerteDinde Date: Mon, 1 May 2023 21:07:08 -0700 Subject: [PATCH 06/15] build: handle icon in config --- forge.config.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/forge.config.js b/forge.config.js index 0e848eebd9..7781a483cf 100644 --- a/forge.config.js +++ b/forge.config.js @@ -138,7 +138,9 @@ const config = { name: '@electron-forge/maker-snap', platforms: ['linux'], config: { - ...commonLinuxConfig, + appConfig: { + icon: path.resolve(iconDir, 'fiddle.svg'), + }, features: { audio: true, video: true, From 0d1af2082ce0aec0a28a3ff6575c803bbb70cc28 Mon Sep 17 00:00:00 2001 From: VerteDinde Date: Mon, 1 May 2023 21:16:24 -0700 Subject: [PATCH 07/15] build: add debug command --- .circleci/config.yml | 10 ++++++---- forge.config.js | 3 +-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5953943a02..ff5474a155 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -121,11 +121,13 @@ jobs: - image: ubuntudesktop/gnome-3-38-2004 steps: - run: sudo apt-get -y update - - run: sudo apt-get install -y git curl dpkg fakeroot rpm - # - run: sudo snap install snapd - # - run: sudo snap install snapcraft --classic + - run: sudo apt-get install -y git curl dpkg fakeroot rpm lsb-release - install - - run: npx yarn run publish --arch=<< parameters.arch >> --dry-run + - run: echo $PATH + - run: | + export PATH="/snap/bin:$PATH" + export SNAP="/snap/snapcraft/current" + - run: DEBUG=electron-installer-snap:* npx yarn run publish --arch=<< parameters.arch >> --dry-run # CircleCI doesn't let you persist files with the same name from multiple # jobs, so only persist the .webpack path from the x64 linux-build job - when: diff --git a/forge.config.js b/forge.config.js index 7781a483cf..1bb2dc8b4e 100644 --- a/forge.config.js +++ b/forge.config.js @@ -143,9 +143,8 @@ const config = { }, features: { audio: true, - video: true, - webgl: true, }, + snapcraft: '/snap/bin/snapcraft', }, }, ], From 8ab847e9cb1a65a78d5fb2399842d47a75536fc8 Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Tue, 2 May 2023 11:31:25 -0700 Subject: [PATCH 08/15] build: use cibuilds/snapcraft:core18 --- .circleci/config.yml | 8 ++++---- forge.config.js | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ff5474a155..390b03d81b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -118,15 +118,15 @@ jobs: type: enum enum: [ 'x64', 'arm64','armv7l' ] docker: - - image: ubuntudesktop/gnome-3-38-2004 + - image: cibuilds/snapcraft:core20 steps: - run: sudo apt-get -y update - run: sudo apt-get install -y git curl dpkg fakeroot rpm lsb-release - install - run: echo $PATH - - run: | - export PATH="/snap/bin:$PATH" - export SNAP="/snap/snapcraft/current" + # - run: | + # export PATH="/snap/bin:$PATH" + # export SNAP="/snap/snapcraft/current" - run: DEBUG=electron-installer-snap:* npx yarn run publish --arch=<< parameters.arch >> --dry-run # CircleCI doesn't let you persist files with the same name from multiple # jobs, so only persist the .webpack path from the x64 linux-build job diff --git a/forge.config.js b/forge.config.js index 1bb2dc8b4e..3622e75173 100644 --- a/forge.config.js +++ b/forge.config.js @@ -144,7 +144,6 @@ const config = { features: { audio: true, }, - snapcraft: '/snap/bin/snapcraft', }, }, ], From d0444933dde5f4791a5939a888f3306f01a870de Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Tue, 2 May 2023 11:52:57 -0700 Subject: [PATCH 09/15] build: revert to support dockerfile, use wrapper --- .circleci/config.yml | 10 ++++++---- .circleci/snapcraft-wrapper | 13 +++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 .circleci/snapcraft-wrapper diff --git a/.circleci/config.yml b/.circleci/config.yml index 390b03d81b..2034d9a2b2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -118,15 +118,17 @@ jobs: type: enum enum: [ 'x64', 'arm64','armv7l' ] docker: - - image: cibuilds/snapcraft:core20 + - image: ubuntudesktop/gnome-3-38-2004 steps: - run: sudo apt-get -y update - run: sudo apt-get install -y git curl dpkg fakeroot rpm lsb-release - install - run: echo $PATH - # - run: | - # export PATH="/snap/bin:$PATH" - # export SNAP="/snap/snapcraft/current" + - run: cp ./.circleci/snapcraft-wrapper /snap/bin/snapcraft + - run: + command: | + echo 'export PATH=/snap/bin:"$PATH"' >> "$BASH_ENV" + source "$BASH_ENV" - run: DEBUG=electron-installer-snap:* npx yarn run publish --arch=<< parameters.arch >> --dry-run # CircleCI doesn't let you persist files with the same name from multiple # jobs, so only persist the .webpack path from the x64 linux-build job diff --git a/.circleci/snapcraft-wrapper b/.circleci/snapcraft-wrapper new file mode 100644 index 0000000000..14d44fbad9 --- /dev/null +++ b/.circleci/snapcraft-wrapper @@ -0,0 +1,13 @@ +#!/bin/sh + +SNAP="/snap/snapcraft/current" +SNAP_NAME="$(awk '/^name:/{print $2}' $SNAP/meta/snap.yaml)" +SNAP_VERSION="$(awk '/^version:/{print $2}' $SNAP/meta/snap.yaml)" +SNAP_ARCH="amd64" + +export SNAP +export SNAP_NAME +export SNAP_VERSION +export SNAP_ARCH + +exec "$SNAP/usr/bin/python3" "$SNAP/bin/snapcraft" "$@" \ No newline at end of file From e2abe7a059f9bf61225cd21cf982a6e397080951 Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Tue, 2 May 2023 12:06:22 -0700 Subject: [PATCH 10/15] build: remove debug variable --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2034d9a2b2..975b01594f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -129,7 +129,7 @@ jobs: command: | echo 'export PATH=/snap/bin:"$PATH"' >> "$BASH_ENV" source "$BASH_ENV" - - run: DEBUG=electron-installer-snap:* npx yarn run publish --arch=<< parameters.arch >> --dry-run + - run: npx yarn run publish --arch=<< parameters.arch >> --dry-run # CircleCI doesn't let you persist files with the same name from multiple # jobs, so only persist the .webpack path from the x64 linux-build job - when: From 61281edd9d596b6c0f2fd38b1053c96d56a4fa42 Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Tue, 2 May 2023 12:27:56 -0700 Subject: [PATCH 11/15] build: [debug] patch info into snap installer --- .circleci/config.yml | 2 +- package.json | 3 +- patches/electron-installer-snap+5.2.0.patch | 12 +++ yarn.lock | 93 +++++++++++++++++++-- 4 files changed, 102 insertions(+), 8 deletions(-) create mode 100644 patches/electron-installer-snap+5.2.0.patch diff --git a/.circleci/config.yml b/.circleci/config.yml index 975b01594f..2034d9a2b2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -129,7 +129,7 @@ jobs: command: | echo 'export PATH=/snap/bin:"$PATH"' >> "$BASH_ENV" source "$BASH_ENV" - - run: npx yarn run publish --arch=<< parameters.arch >> --dry-run + - run: DEBUG=electron-installer-snap:* npx yarn run publish --arch=<< parameters.arch >> --dry-run # CircleCI doesn't let you persist files with the same name from multiple # jobs, so only persist the .webpack path from the x64 linux-build job - when: diff --git a/package.json b/package.json index 057c53f9ea..acff38e96a 100644 --- a/package.json +++ b/package.json @@ -72,8 +72,8 @@ "@babel/core": "^7.13.8", "@electron-forge/cli": "^6.1.1", "@electron-forge/maker-deb": "^6.1.1", - "@electron-forge/maker-snap": "^6.1.1", "@electron-forge/maker-rpm": "^6.1.1", + "@electron-forge/maker-snap": "^6.1.1", "@electron-forge/maker-squirrel": "^6.1.1", "@electron-forge/maker-zip": "^6.1.1", "@electron-forge/plugin-webpack": "^6.1.1", @@ -126,6 +126,7 @@ "mini-css-extract-plugin": "^2.6.1", "monaco-editor-webpack-plugin": "2.1.0", "npm-run-all": "^4.1.5", + "patch-package": "^7.0.0", "prettier": "^2.2.1", "recursive-readdir": "^2.2.2", "resolve-url-loader": "^5.0.0", diff --git a/patches/electron-installer-snap+5.2.0.patch b/patches/electron-installer-snap+5.2.0.patch new file mode 100644 index 0000000000..35fa434e41 --- /dev/null +++ b/patches/electron-installer-snap+5.2.0.patch @@ -0,0 +1,12 @@ +diff --git a/node_modules/electron-installer-snap/src/snapcraft.js b/node_modules/electron-installer-snap/src/snapcraft.js +index be64a19..2090daa 100644 +--- a/node_modules/electron-installer-snap/src/snapcraft.js ++++ b/node_modules/electron-installer-snap/src/snapcraft.js +@@ -65,7 +65,6 @@ class Snapcraft { + } + /* istanbul ignore if */ + if (debug.enabled) { +- args.push('--destructive-mode') + args.push('--debug') + } + diff --git a/yarn.lock b/yarn.lock index 1832e4719c..e98cc6d2ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2540,6 +2540,11 @@ resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== +"@yarnpkg/lockfile@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" + integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== + abab@^2.0.3, abab@^2.0.5: version "2.0.6" resolved "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz" @@ -3423,6 +3428,11 @@ ci-info@^3.2.0: resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz" integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw== +ci-info@^3.7.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" + integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== + cjs-module-lexer@^1.0.0: version "1.2.2" resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz" @@ -5337,6 +5347,13 @@ find-up@^5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" +find-yarn-workspace-root@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd" + integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ== + dependencies: + micromatch "^4.0.2" + flat-cache@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz" @@ -5866,6 +5883,11 @@ got@^11.8.2: p-cancelable "^2.0.0" responselike "^2.0.0" +graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== + graceful-fs@^4.1.15: version "4.2.6" resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz" @@ -5876,11 +5898,6 @@ graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -graceful-fs@^4.1.6, graceful-fs@^4.2.0: - version "4.2.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" - integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== - gud@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz" @@ -6621,7 +6638,7 @@ is-windows@^1.0.1: resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== -is-wsl@^2.2.0: +is-wsl@^2.1.1, is-wsl@^2.2.0: version "2.2.0" resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz" integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== @@ -7271,6 +7288,13 @@ kind-of@^6.0.2, kind-of@^6.0.3: resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== +klaw-sync@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c" + integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ== + dependencies: + graceful-fs "^4.1.11" + kleur@^3.0.3: version "3.0.3" resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz" @@ -8406,6 +8430,14 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" +open@^7.4.2: + version "7.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" + integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== + dependencies: + is-docker "^2.0.0" + is-wsl "^2.1.1" + open@^8.0.9, open@^8.4.0: version "8.4.0" resolved "https://registry.npmjs.org/open/-/open-8.4.0.tgz" @@ -8462,6 +8494,11 @@ os-name@^3.1.0: macos-release "^2.2.0" windows-release "^3.1.0" +os-tmpdir@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== + p-cancelable@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" @@ -8670,6 +8707,26 @@ pascal-case@^3.1.2: no-case "^3.0.4" tslib "^2.0.3" +patch-package@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-7.0.0.tgz#5c646b6b4b4bf37e5184a6950777b21dea6bb66e" + integrity sha512-eYunHbnnB2ghjTNc5iL1Uo7TsGMuXk0vibX3RFcE/CdVdXzmdbMsG/4K4IgoSuIkLTI5oHrMQk4+NkFqSed0BQ== + dependencies: + "@yarnpkg/lockfile" "^1.1.0" + chalk "^4.1.2" + ci-info "^3.7.0" + cross-spawn "^7.0.3" + find-yarn-workspace-root "^2.0.0" + fs-extra "^9.0.0" + klaw-sync "^6.0.0" + minimist "^1.2.6" + open "^7.4.2" + rimraf "^2.6.3" + semver "^5.6.0" + slash "^2.0.0" + tmp "^0.0.33" + yaml "^2.2.2" + path-exists@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz" @@ -9645,6 +9702,13 @@ rimraf@2.6.3, rimraf@~2.6.2: dependencies: glob "^7.1.3" +rimraf@^2.6.3: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" @@ -9944,6 +10008,11 @@ sisteransi@^1.0.5: resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz" integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== +slash@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" + integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== + slash@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz" @@ -10631,6 +10700,13 @@ tmp@0.2.1, tmp@^0.2.0: dependencies: rimraf "^3.0.0" +tmp@^0.0.33: + version "0.0.33" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== + dependencies: + os-tmpdir "~1.0.2" + tmpl@1.0.x: version "1.0.5" resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz" @@ -11444,6 +11520,11 @@ yaml@^1.10.0: resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== +yaml@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.2.2.tgz#ec551ef37326e6d42872dad1970300f8eb83a073" + integrity sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA== + yargs-parser@20.x, yargs-parser@^20.2.3: version "20.2.7" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz" From 2c864b1abcd7c297a1bc3d725329cb39703ee108 Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Tue, 2 May 2023 12:56:35 -0700 Subject: [PATCH 12/15] build: move icon in config --- forge.config.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/forge.config.js b/forge.config.js index 3622e75173..22072a70c3 100644 --- a/forge.config.js +++ b/forge.config.js @@ -138,9 +138,7 @@ const config = { name: '@electron-forge/maker-snap', platforms: ['linux'], config: { - appConfig: { - icon: path.resolve(iconDir, 'fiddle.svg'), - }, + icon: path.resolve(iconDir, 'fiddle.svg'), features: { audio: true, }, From a66c542ade4507b4b5d3a8a4a9d60d06d57aa86c Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Tue, 2 May 2023 13:45:05 -0700 Subject: [PATCH 13/15] build: hell yes (clean up debugger code) --- .circleci/config.yml | 3 +- package.json | 1 - patches/electron-installer-snap+5.2.0.patch | 12 --- yarn.lock | 93 ++------------------- 4 files changed, 7 insertions(+), 102 deletions(-) delete mode 100644 patches/electron-installer-snap+5.2.0.patch diff --git a/.circleci/config.yml b/.circleci/config.yml index 2034d9a2b2..a40f4ef0f2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -123,13 +123,12 @@ jobs: - run: sudo apt-get -y update - run: sudo apt-get install -y git curl dpkg fakeroot rpm lsb-release - install - - run: echo $PATH - run: cp ./.circleci/snapcraft-wrapper /snap/bin/snapcraft - run: command: | echo 'export PATH=/snap/bin:"$PATH"' >> "$BASH_ENV" source "$BASH_ENV" - - run: DEBUG=electron-installer-snap:* npx yarn run publish --arch=<< parameters.arch >> --dry-run + - run: npx yarn run publish --arch=<< parameters.arch >> --dry-run # CircleCI doesn't let you persist files with the same name from multiple # jobs, so only persist the .webpack path from the x64 linux-build job - when: diff --git a/package.json b/package.json index acff38e96a..a001543f74 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,6 @@ "mini-css-extract-plugin": "^2.6.1", "monaco-editor-webpack-plugin": "2.1.0", "npm-run-all": "^4.1.5", - "patch-package": "^7.0.0", "prettier": "^2.2.1", "recursive-readdir": "^2.2.2", "resolve-url-loader": "^5.0.0", diff --git a/patches/electron-installer-snap+5.2.0.patch b/patches/electron-installer-snap+5.2.0.patch deleted file mode 100644 index 35fa434e41..0000000000 --- a/patches/electron-installer-snap+5.2.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/node_modules/electron-installer-snap/src/snapcraft.js b/node_modules/electron-installer-snap/src/snapcraft.js -index be64a19..2090daa 100644 ---- a/node_modules/electron-installer-snap/src/snapcraft.js -+++ b/node_modules/electron-installer-snap/src/snapcraft.js -@@ -65,7 +65,6 @@ class Snapcraft { - } - /* istanbul ignore if */ - if (debug.enabled) { -- args.push('--destructive-mode') - args.push('--debug') - } - diff --git a/yarn.lock b/yarn.lock index e98cc6d2ff..1832e4719c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2540,11 +2540,6 @@ resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -"@yarnpkg/lockfile@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" - integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== - abab@^2.0.3, abab@^2.0.5: version "2.0.6" resolved "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz" @@ -3428,11 +3423,6 @@ ci-info@^3.2.0: resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz" integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw== -ci-info@^3.7.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" - integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== - cjs-module-lexer@^1.0.0: version "1.2.2" resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz" @@ -5347,13 +5337,6 @@ find-up@^5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" -find-yarn-workspace-root@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd" - integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ== - dependencies: - micromatch "^4.0.2" - flat-cache@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz" @@ -5883,11 +5866,6 @@ got@^11.8.2: p-cancelable "^2.0.0" responselike "^2.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.0: - version "4.2.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" - integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== - graceful-fs@^4.1.15: version "4.2.6" resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz" @@ -5898,6 +5876,11 @@ graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== +graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== + gud@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz" @@ -6638,7 +6621,7 @@ is-windows@^1.0.1: resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== -is-wsl@^2.1.1, is-wsl@^2.2.0: +is-wsl@^2.2.0: version "2.2.0" resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz" integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== @@ -7288,13 +7271,6 @@ kind-of@^6.0.2, kind-of@^6.0.3: resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -klaw-sync@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c" - integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ== - dependencies: - graceful-fs "^4.1.11" - kleur@^3.0.3: version "3.0.3" resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz" @@ -8430,14 +8406,6 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" -open@^7.4.2: - version "7.4.2" - resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" - integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== - dependencies: - is-docker "^2.0.0" - is-wsl "^2.1.1" - open@^8.0.9, open@^8.4.0: version "8.4.0" resolved "https://registry.npmjs.org/open/-/open-8.4.0.tgz" @@ -8494,11 +8462,6 @@ os-name@^3.1.0: macos-release "^2.2.0" windows-release "^3.1.0" -os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== - p-cancelable@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" @@ -8707,26 +8670,6 @@ pascal-case@^3.1.2: no-case "^3.0.4" tslib "^2.0.3" -patch-package@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-7.0.0.tgz#5c646b6b4b4bf37e5184a6950777b21dea6bb66e" - integrity sha512-eYunHbnnB2ghjTNc5iL1Uo7TsGMuXk0vibX3RFcE/CdVdXzmdbMsG/4K4IgoSuIkLTI5oHrMQk4+NkFqSed0BQ== - dependencies: - "@yarnpkg/lockfile" "^1.1.0" - chalk "^4.1.2" - ci-info "^3.7.0" - cross-spawn "^7.0.3" - find-yarn-workspace-root "^2.0.0" - fs-extra "^9.0.0" - klaw-sync "^6.0.0" - minimist "^1.2.6" - open "^7.4.2" - rimraf "^2.6.3" - semver "^5.6.0" - slash "^2.0.0" - tmp "^0.0.33" - yaml "^2.2.2" - path-exists@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz" @@ -9702,13 +9645,6 @@ rimraf@2.6.3, rimraf@~2.6.2: dependencies: glob "^7.1.3" -rimraf@^2.6.3: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" @@ -10008,11 +9944,6 @@ sisteransi@^1.0.5: resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz" integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== -slash@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" - integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== - slash@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz" @@ -10700,13 +10631,6 @@ tmp@0.2.1, tmp@^0.2.0: dependencies: rimraf "^3.0.0" -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== - dependencies: - os-tmpdir "~1.0.2" - tmpl@1.0.x: version "1.0.5" resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz" @@ -11520,11 +11444,6 @@ yaml@^1.10.0: resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -yaml@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.2.2.tgz#ec551ef37326e6d42872dad1970300f8eb83a073" - integrity sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA== - yargs-parser@20.x, yargs-parser@^20.2.3: version "20.2.7" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz" From 31f7bb6b9e834ad072222879823a39cfb945b60e Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Tue, 2 May 2023 14:03:20 -0700 Subject: [PATCH 14/15] build: enable all linux arches --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a40f4ef0f2..406ed54289 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -214,8 +214,7 @@ workflows: - linux-build: matrix: parameters: - arch: [ x64 ] - # arch: [ x64, arm64, armv7l ] + arch: [ x64, arm64, armv7l ] # filters: # tags: # only: From 91ff3a077bcb51e7eac3ecd9067e9d5b8e7d98bc Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Tue, 2 May 2023 14:14:06 -0700 Subject: [PATCH 15/15] build: restore all jobs/filters --- .circleci/config.yml | 56 ++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 406ed54289..cd4f7e0239 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -179,18 +179,18 @@ workflows: build-and-test: jobs: - lint - # - mac-test: - # matrix: - # parameters: - # arch: [ x64, arm64 ] - # - win-test: - # matrix: - # parameters: - # arch: [ x64 ] - # - linux-test: - # matrix: - # parameters: - # arch: [ x64 ] + - mac-test: + matrix: + parameters: + arch: [ x64, arm64 ] + - win-test: + matrix: + parameters: + arch: [ x64 ] + - linux-test: + matrix: + parameters: + arch: [ x64 ] - mac-build: matrix: parameters: @@ -215,27 +215,27 @@ workflows: matrix: parameters: arch: [ x64, arm64, armv7l ] - # filters: - # tags: - # only: - # - /^v.*/ - # branches: - # ignore: /.*/ + filters: + tags: + only: + - /^v.*/ + branches: + ignore: /.*/ - publish-to-github: context: fiddle-release requires: - lint - # - mac-test-x64 - # - mac-test-arm64 - # - win-test-x64 - # - linux-test-x64 - # - mac-build-x64 - # - mac-build-arm64 - # - win-build-ia32 - # - win-build-x64 + - mac-test-x64 + - mac-test-arm64 + - win-test-x64 + - linux-test-x64 + - mac-build-x64 + - mac-build-arm64 + - win-build-ia32 + - win-build-x64 - linux-build-x64 - # - linux-build-arm64 - # - linux-build-armv7l + - linux-build-arm64 + - linux-build-armv7l filters: tags: only: