From f6509796f6f4961601d5cb8a0eacc75e84022bbd Mon Sep 17 00:00:00 2001 From: vapormusic Date: Sat, 16 Jul 2022 18:00:04 +0700 Subject: [PATCH 1/4] Update package.json --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index a0d37ca..e573316 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,9 @@ "build-binaries-electron:linux": "prebuild --platform linux --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 19.0.3 -t 18.3.3", "build-binaries-electron:darwin": "prebuild --platform darwin --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 19.0.3 -t 18.3.3", "build-binaries-electron2": "prebuild --platform darwin -a arm64 --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 19.0.3 -t 18.3.3", - "install": "prebuild-install --runtime=electron --target=19.0.2 || npm run rebuild", + "install": "run-script-os", + "install:win32": "prebuild-install --runtime=electron || npm run rebuild", + "install:linux:darwin": "prebuild-install --runtime=electron --target=18.3.3 || npm run rebuild", "rebuild": "node-gyp configure build" }, "licenses": [ From c6ec6b035556ee0b3f86d80d3bb6f6213b5a5f00 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Sat, 16 Jul 2022 18:09:04 -0700 Subject: [PATCH 2/4] fix CI --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index e573316..8e86706 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,8 @@ "parse-raw-http": "0.0.1", "prebuild-install": "^7.1.0", "simple-plist": "^1.3.1", - "yargs": "^9.0.1" + "yargs": "^9.0.1", + "run-script-os": "^1.1.6" }, "devDependencies": { "optimist": "^0.6.1", From 8a714a734057a8d63d4d8c717d4f004e618cc498 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Sun, 24 Jul 2022 20:58:28 -0700 Subject: [PATCH 3/4] Add electron 20 --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8e86706..79e7af0 100644 --- a/package.json +++ b/package.json @@ -19,11 +19,11 @@ }, "scripts": { "build-binaries-electron": "run-script-os", - "build-binaries-electron-ci": "prebuild --platform win32 --platform linux --platform darwin --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 19.0.1 -t 16.0.7", - "build-binaries-electron:win32": "prebuild --platform win32 --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 19.0.3 -t 18.3.3 -t 16.0.7", - "build-binaries-electron:linux": "prebuild --platform linux --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 19.0.3 -t 18.3.3", - "build-binaries-electron:darwin": "prebuild --platform darwin --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 19.0.3 -t 18.3.3", - "build-binaries-electron2": "prebuild --platform darwin -a arm64 --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 19.0.3 -t 18.3.3", + "build-binaries-electron-ci": "prebuild --platform win32 --platform linux --platform darwin --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 19.0.1 -t 16.0.7 -t 20.0.0", + "build-binaries-electron:win32": "prebuild --platform win32 --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t -t 18.3.3 -t 16.0.7 -t 20.0.0", + "build-binaries-electron:linux": "prebuild --platform linux --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 18.3.3 -t 20.0.0", + "build-binaries-electron:darwin": "prebuild --platform darwin --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 18.3.3 -t 20.0.0", + "build-binaries-electron2": "prebuild --platform darwin -a arm64 --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 18.3.3 -t 20.0.0", "install": "run-script-os", "install:win32": "prebuild-install --runtime=electron || npm run rebuild", "install:linux:darwin": "prebuild-install --runtime=electron --target=18.3.3 || npm run rebuild", From a70563b78b929470ca68d051f9b91b105fd38400 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Sun, 24 Jul 2022 21:02:35 -0700 Subject: [PATCH 4/4] Revert "Add electron 20" This reverts commit 8a714a734057a8d63d4d8c717d4f004e618cc498. --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 79e7af0..8e86706 100644 --- a/package.json +++ b/package.json @@ -19,11 +19,11 @@ }, "scripts": { "build-binaries-electron": "run-script-os", - "build-binaries-electron-ci": "prebuild --platform win32 --platform linux --platform darwin --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 19.0.1 -t 16.0.7 -t 20.0.0", - "build-binaries-electron:win32": "prebuild --platform win32 --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t -t 18.3.3 -t 16.0.7 -t 20.0.0", - "build-binaries-electron:linux": "prebuild --platform linux --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 18.3.3 -t 20.0.0", - "build-binaries-electron:darwin": "prebuild --platform darwin --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 18.3.3 -t 20.0.0", - "build-binaries-electron2": "prebuild --platform darwin -a arm64 --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 18.3.3 -t 20.0.0", + "build-binaries-electron-ci": "prebuild --platform win32 --platform linux --platform darwin --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 19.0.1 -t 16.0.7", + "build-binaries-electron:win32": "prebuild --platform win32 --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 19.0.3 -t 18.3.3 -t 16.0.7", + "build-binaries-electron:linux": "prebuild --platform linux --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 19.0.3 -t 18.3.3", + "build-binaries-electron:darwin": "prebuild --platform darwin --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 19.0.3 -t 18.3.3", + "build-binaries-electron2": "prebuild --platform darwin -a arm64 --include-regex \"^.*\\.(node|dylib|lib|exp|dll|so(\\.[0-9])?)$\" -r electron -t 19.0.3 -t 18.3.3", "install": "run-script-os", "install:win32": "prebuild-install --runtime=electron || npm run rebuild", "install:linux:darwin": "prebuild-install --runtime=electron --target=18.3.3 || npm run rebuild",