mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 04:49:35 +00:00
Squashed commit of the following:
commit 36f3d9d21bff68d1f7848aa14960f212bd019625 Author: João Moreno <joao.moreno@microsoft.com> Date: Thu Jan 28 13:23:23 2021 +0100 npx commit 8ccb45e5dc70333f30fa7ebe3e5657bba2eb2db0 Author: João Moreno <joao.moreno@microsoft.com> Date: Thu Jan 28 12:52:15 2021 +0100 bump cache salt commit 5f5d6b19cb0f3192365b3fa518538938872f239e Author: João Moreno <joao.moreno@microsoft.com> Date: Thu Jan 28 11:39:32 2021 +0100 force rebuild keytar commit a5f800f991b742d91a2ba2c9ee82c84e30cd9736 Author: João Moreno <joao.moreno@microsoft.com> Date: Wed Jan 27 16:16:05 2021 +0100 bump cache salt commit e894045003a20d1ea5930e66a53d6f7d5076cdb7 Author: João Moreno <joao.moreno@microsoft.com> Date: Wed Jan 27 16:15:24 2021 +0100 fixes #113467
This commit is contained in:
parent
3a287ee1ea
commit
17c617039b
|
@ -1 +1 @@
|
|||
2021-01-07T09:53:10.404Z
|
||||
2021-01-28T11:52:11.376Z
|
||||
|
|
|
@ -112,6 +112,7 @@ steps:
|
|||
export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
|
||||
ls /Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
|
||||
yarn electron-rebuild
|
||||
# remove once https://github.com/prebuild/prebuild-install/pull/140 is merged and found in keytar
|
||||
cd ./node_modules/keytar
|
||||
node-gyp rebuild
|
||||
displayName: Rebuild native modules for ARM64
|
||||
|
|
|
@ -75,6 +75,7 @@ steps:
|
|||
- script: |
|
||||
set -e
|
||||
export npm_config_arch=$(NPM_ARCH)
|
||||
export npm_config_build_from_source=true
|
||||
|
||||
if [ -z "$CC" ] || [ -z "$CXX" ]; then
|
||||
export CC=$(which gcc-5)
|
||||
|
@ -95,6 +96,10 @@ steps:
|
|||
fi
|
||||
echo "Yarn failed $i, trying again..."
|
||||
done
|
||||
|
||||
# remove once https://github.com/prebuild/prebuild-install/pull/140 is merged and found in keytar
|
||||
cd ./node_modules/keytar
|
||||
npx node-gyp rebuild
|
||||
env:
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
|
||||
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
|
||||
|
|
Loading…
Reference in a new issue