Skip to content

Commit 6b89f1a

Browse files
TylerLeonhardtjoaomoreno
authored andcommitted
Don't call node-gyp anymore (#120673)
This npx call was installing node-gyp 8.0 which requires a newer version of Python then what's in our containers. I've removed it but also followed the advice of the comment that says only remove it if prebuild-install is updated in keytar... So I updated keytar's dependencies which pulled in prebuild-install 6.1.1 with the fix. If this isn't the right move, feel free to revert and then we can move to Debian Buster which has a version of Python that is new enough.
1 parent 6e3220a commit 6b89f1a

File tree

2 files changed

+36
-42
lines changed

2 files changed

+36
-42
lines changed

build/azure-pipelines/linux/product-build-linux.yml

-4
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,6 @@ steps:
9797
fi
9898
echo "Yarn failed $i, trying again..."
9999
done
100-
101-
# remove once https://github.com/prebuild/prebuild-install/pull/140 is merged and found in keytar
102-
cd ./node_modules/keytar
103-
npx node-gyp rebuild
104100
env:
105101
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
106102
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1

yarn.lock

+36-38
Original file line numberDiff line numberDiff line change
@@ -1403,7 +1403,7 @@ balanced-match@^1.0.0:
14031403
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
14041404
integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
14051405

1406-
base64-js@^1.0.2, base64-js@^1.2.3:
1406+
base64-js@^1.0.2, base64-js@^1.2.3, base64-js@^1.3.1:
14071407
version "1.5.1"
14081408
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
14091409
integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
@@ -1470,7 +1470,7 @@ bindings@^1.5.0:
14701470
dependencies:
14711471
file-uri-to-path "1.0.0"
14721472

1473-
bl@^4.0.2, bl@^4.0.3:
1473+
bl@^4.0.2:
14741474
version "4.0.3"
14751475
resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"
14761476
integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==
@@ -1479,6 +1479,15 @@ bl@^4.0.2, bl@^4.0.3:
14791479
inherits "^2.0.4"
14801480
readable-stream "^3.4.0"
14811481

1482+
bl@^4.0.3:
1483+
version "4.1.0"
1484+
resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
1485+
integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
1486+
dependencies:
1487+
buffer "^5.5.0"
1488+
inherits "^2.0.4"
1489+
readable-stream "^3.4.0"
1490+
14821491
block-stream@*:
14831492
version "0.0.9"
14841493
resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
@@ -1673,12 +1682,12 @@ buffer@^4.3.0:
16731682
isarray "^1.0.0"
16741683

16751684
buffer@^5.5.0:
1676-
version "5.5.0"
1677-
resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.5.0.tgz#9c3caa3d623c33dd1c7ef584b89b88bf9c9bc1ce"
1678-
integrity sha512-9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww==
1685+
version "5.7.1"
1686+
resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
1687+
integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
16791688
dependencies:
1680-
base64-js "^1.0.2"
1681-
ieee754 "^1.1.4"
1689+
base64-js "^1.3.1"
1690+
ieee754 "^1.1.13"
16821691

16831692
builtin-status-codes@^3.0.0:
16841693
version "3.0.0"
@@ -4935,7 +4944,7 @@ icss-utils@^4.0.0, icss-utils@^4.1.1:
49354944
dependencies:
49364945
postcss "^7.0.14"
49374946

4938-
ieee754@^1.1.4:
4947+
ieee754@^1.1.13, ieee754@^1.1.4:
49394948
version "1.2.1"
49404949
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
49414950
integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
@@ -6591,19 +6600,26 @@ nice-try@^1.0.4:
65916600
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
65926601
integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
65936602

6594-
node-abi@^2.19.1, node-abi@^2.7.0:
6603+
node-abi@^2.19.1:
65956604
version "2.19.3"
65966605
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.19.3.tgz#252f5dcab12dad1b5503b2d27eddd4733930282d"
65976606
integrity sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==
65986607
dependencies:
65996608
semver "^5.4.1"
66006609

6601-
node-addon-api@*:
6610+
node-abi@^2.21.0:
6611+
version "2.21.0"
6612+
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.21.0.tgz#c2dc9ebad6f4f53d6ea9b531e7b8faad81041d48"
6613+
integrity sha512-smhrivuPqEM3H5LmnY3KU6HfYv0u4QklgAxfFyRNujKUzbUcYZ+Jc2EhukB9SRcD2VpqhxM7n/MIcp1Ua1/JMg==
6614+
dependencies:
6615+
semver "^5.4.1"
6616+
6617+
node-addon-api@*, node-addon-api@^3.0.0:
66026618
version "3.1.0"
66036619
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.1.0.tgz#98b21931557466c6729e51cb77cd39c965f42239"
66046620
integrity sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==
66056621

6606-
node-addon-api@^3.0.0, node-addon-api@^3.0.2:
6622+
node-addon-api@^3.0.2:
66076623
version "3.0.2"
66086624
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.0.2.tgz#04bc7b83fd845ba785bb6eae25bc857e1ef75681"
66096625
integrity sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==
@@ -7765,25 +7781,24 @@ postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.5, postcss@^7.0.
77657781
supports-color "^6.1.0"
77667782

77677783
prebuild-install@^6.0.0:
7768-
version "6.0.0"
7769-
resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.0.0.tgz#669022bcde57c710a869e39c5ca6bf9cd207f316"
7770-
integrity sha512-h2ZJ1PXHKWZpp1caLw0oX9sagVpL2YTk+ZwInQbQ3QqNd4J03O6MpFNmMTJlkfgPENWqe5kP0WjQLqz5OjLfsw==
7784+
version "6.1.1"
7785+
resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.1.tgz#6754fa6c0d55eced7f9e14408ff9e4cba6f097b4"
7786+
integrity sha512-M+cKwofFlHa5VpTWub7GLg5RLcunYIcLqtY5pKcls/u7xaAb8FrXZ520qY8rkpYy5xw90tYCyMO0MP5ggzR3Sw==
77717787
dependencies:
77727788
detect-libc "^1.0.3"
77737789
expand-template "^2.0.3"
77747790
github-from-package "0.0.0"
77757791
minimist "^1.2.3"
77767792
mkdirp-classic "^0.5.3"
77777793
napi-build-utils "^1.0.1"
7778-
node-abi "^2.7.0"
7794+
node-abi "^2.21.0"
77797795
noop-logger "^0.1.1"
77807796
npmlog "^4.0.1"
77817797
pump "^3.0.0"
77827798
rc "^1.2.7"
77837799
simple-get "^3.0.3"
77847800
tar-fs "^2.0.0"
77857801
tunnel-agent "^0.6.0"
7786-
which-pm-runs "^1.0.0"
77877802

77887803
prelude-ls@~1.1.2:
77897804
version "1.1.2"
@@ -8534,7 +8549,7 @@ semver-greatest-satisfied-range@^1.1.0:
85348549
dependencies:
85358550
sver-compat "^1.5.0"
85368551

8537-
"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
8552+
"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
85388553
version "5.7.1"
85398554
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
85408555
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -8544,11 +8559,6 @@ semver@^4.3.4:
85448559
resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
85458560
integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
85468561

8547-
semver@^5.4.1:
8548-
version "5.5.0"
8549-
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
8550-
integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
8551-
85528562
semver@^6.0.0:
85538563
version "6.2.0"
85548564
resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db"
@@ -9073,20 +9083,13 @@ string.prototype.trimstart@^1.0.1:
90739083
call-bind "^1.0.0"
90749084
define-properties "^1.1.3"
90759085

9076-
string_decoder@^1.0.0:
9086+
string_decoder@^1.0.0, string_decoder@^1.1.1:
90779087
version "1.3.0"
90789088
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
90799089
integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
90809090
dependencies:
90819091
safe-buffer "~5.2.0"
90829092

9083-
string_decoder@^1.1.1:
9084-
version "1.2.0"
9085-
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
9086-
integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
9087-
dependencies:
9088-
safe-buffer "~5.1.0"
9089-
90909093
string_decoder@~0.10.x:
90919094
version "0.10.31"
90929095
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
@@ -9289,9 +9292,9 @@ tar-fs@^2.0.0:
92899292
tar-stream "^2.1.4"
92909293

92919294
tar-stream@^2.1.4:
9292-
version "2.1.4"
9293-
resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz#c4fb1a11eb0da29b893a5b25476397ba2d053bfa"
9294-
integrity sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==
9295+
version "2.2.0"
9296+
resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
9297+
integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
92959298
dependencies:
92969299
bl "^4.0.3"
92979300
end-of-stream "^1.4.1"
@@ -10261,11 +10264,6 @@ which-module@^2.0.0:
1026110264
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
1026210265
integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
1026310266

10264-
which-pm-runs@^1.0.0:
10265-
version "1.0.0"
10266-
resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
10267-
integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
10268-
1026910267
[email protected], which@^2.0.1, which@^2.0.2:
1027010268
version "2.0.2"
1027110269
resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"

0 commit comments

Comments
 (0)