Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/vscode.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorRobo <hop2deep@gmail.com>2020-11-30 22:24:10 +0300
committerGitHub <noreply@github.com>2020-11-30 22:24:10 +0300
commit155691d0bec4acfac0e3bbccb362f61278a132de (patch)
treef6eec539b72cab8270d66c922004bc3baf807145 /build
parent5c71b5425a3b18418c46fb6fd74a00bef8f37886 (diff)
chore: bump electron@9.3.5 (#111530)
* chore: bump electron@9.3.5 * Revert "fix: removed plugin helper entitlement" This reverts commit 40a81495f298ddfda8fc7e8b174b3eb1569e9f1b. * Revert "chore: bump vscode-windows-ca-certs@0.3.0" This reverts commit 2f4a3dc31aa56cc0eff04dd58a87cdeb76b2e988.
Diffstat (limited to 'build')
-rw-r--r--build/azure-pipelines/darwin/continuous-build-darwin.yml2
-rw-r--r--build/azure-pipelines/darwin/helper-plugin-entitlements.plist10
-rw-r--r--build/azure-pipelines/darwin/product-build-darwin.yml2
-rw-r--r--build/azure-pipelines/distro-build.yml2
-rw-r--r--build/azure-pipelines/exploration-build.yml2
-rw-r--r--build/azure-pipelines/linux/continuous-build-linux.yml2
-rw-r--r--build/azure-pipelines/linux/product-build-alpine.yml2
-rw-r--r--build/azure-pipelines/linux/product-build-linux.yml8
-rw-r--r--build/azure-pipelines/linux/snap-build-linux.yml2
-rw-r--r--build/azure-pipelines/product-build.yml11
-rw-r--r--build/azure-pipelines/product-compile.yml2
-rw-r--r--build/azure-pipelines/publish-types/publish-types.yml2
-rw-r--r--build/azure-pipelines/sync-mooncake.yml2
-rw-r--r--build/azure-pipelines/web/product-build-web.yml2
-rw-r--r--build/azure-pipelines/win32/continuous-build-win32.yml2
-rw-r--r--build/azure-pipelines/win32/product-build-win32.yml2
-rw-r--r--build/darwin/sign.ts10
17 files changed, 45 insertions, 20 deletions
diff --git a/build/azure-pipelines/darwin/continuous-build-darwin.yml b/build/azure-pipelines/darwin/continuous-build-darwin.yml
index 75c28106c5e..55efe5f32eb 100644
--- a/build/azure-pipelines/darwin/continuous-build-darwin.yml
+++ b/build/azure-pipelines/darwin/continuous-build-darwin.yml
@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
- versionSpec: "12.18.3"
+ versionSpec: "12.14.1"
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
inputs:
diff --git a/build/azure-pipelines/darwin/helper-plugin-entitlements.plist b/build/azure-pipelines/darwin/helper-plugin-entitlements.plist
new file mode 100644
index 00000000000..7cd9df032bd
--- /dev/null
+++ b/build/azure-pipelines/darwin/helper-plugin-entitlements.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+ <true/>
+ <key>com.apple.security.cs.disable-library-validation</key>
+ <true/>
+</dict>
+</plist>
diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index 3c11fd0ed0f..6f7dec16aca 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -22,7 +22,7 @@ steps:
- task: NodeTool@0
inputs:
- versionSpec: "12.18.3"
+ versionSpec: "12.14.1"
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
inputs:
diff --git a/build/azure-pipelines/distro-build.yml b/build/azure-pipelines/distro-build.yml
index 331fbf9675e..99bad6b72cd 100644
--- a/build/azure-pipelines/distro-build.yml
+++ b/build/azure-pipelines/distro-build.yml
@@ -8,7 +8,7 @@ pr:
steps:
- task: NodeTool@0
inputs:
- versionSpec: "12.18.3"
+ versionSpec: "12.14.1"
- task: AzureKeyVault@1
displayName: "Azure Key Vault: Get Secrets"
diff --git a/build/azure-pipelines/exploration-build.yml b/build/azure-pipelines/exploration-build.yml
index d4788edfd1d..c20ff939ad9 100644
--- a/build/azure-pipelines/exploration-build.yml
+++ b/build/azure-pipelines/exploration-build.yml
@@ -11,7 +11,7 @@ pr:
steps:
- task: NodeTool@0
inputs:
- versionSpec: "12.18.3"
+ versionSpec: "12.14.1"
- task: AzureKeyVault@1
displayName: "Azure Key Vault: Get Secrets"
diff --git a/build/azure-pipelines/linux/continuous-build-linux.yml b/build/azure-pipelines/linux/continuous-build-linux.yml
index 44cb9829472..e777f821d76 100644
--- a/build/azure-pipelines/linux/continuous-build-linux.yml
+++ b/build/azure-pipelines/linux/continuous-build-linux.yml
@@ -10,7 +10,7 @@ steps:
- task: NodeTool@0
inputs:
- versionSpec: "12.18.3"
+ versionSpec: "12.14.1"
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
inputs:
diff --git a/build/azure-pipelines/linux/product-build-alpine.yml b/build/azure-pipelines/linux/product-build-alpine.yml
index 8108ff8193d..9a54bc2bc8a 100644
--- a/build/azure-pipelines/linux/product-build-alpine.yml
+++ b/build/azure-pipelines/linux/product-build-alpine.yml
@@ -22,7 +22,7 @@ steps:
- task: NodeTool@0
inputs:
- versionSpec: "12.18.3"
+ versionSpec: "12.14.1"
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
inputs:
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 904fc6dda02..1e88a0a3b53 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -22,7 +22,7 @@ steps:
- task: NodeTool@0
inputs:
- versionSpec: "12.18.3"
+ versionSpec: "12.14.1"
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
inputs:
@@ -114,6 +114,12 @@ steps:
- script: |
set -e
+ service xvfb start
+ displayName: Start xvfb
+ condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+ - script: |
+ set -e
DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
displayName: Run unit tests (Electron)
condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
diff --git a/build/azure-pipelines/linux/snap-build-linux.yml b/build/azure-pipelines/linux/snap-build-linux.yml
index e0f2d2c6e2a..f08c7b3c3e6 100644
--- a/build/azure-pipelines/linux/snap-build-linux.yml
+++ b/build/azure-pipelines/linux/snap-build-linux.yml
@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
- versionSpec: "12.18.3"
+ versionSpec: "12.14.1"
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
inputs:
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index e1a31dc58ff..ebe2fe6abef 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -11,9 +11,8 @@ schedules:
resources:
containers:
- container: vscode-x64
- image: vscodehub.azurecr.io/vscode-linux-build-agent:bionic
+ image: vscodehub.azurecr.io/vscode-linux-build-agent:x64
endpoint: VSCodeHub
- options: --user 0:0
- container: vscode-arm64
image: vscodehub.azurecr.io/vscode-linux-build-agent:stretch-arm64
endpoint: VSCodeHub
@@ -28,7 +27,7 @@ stages:
jobs:
- job: Compile
pool:
- vmImage: "Ubuntu-18.04"
+ vmImage: "Ubuntu-16.04"
container: vscode-x64
variables:
VSCODE_ARCH: x64
@@ -71,7 +70,7 @@ stages:
- Compile
condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
pool:
- vmImage: "Ubuntu-18.04"
+ vmImage: "Ubuntu-16.04"
jobs:
- job: Linux
condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
@@ -180,7 +179,7 @@ stages:
- macOSARM64
condition: and(succeededOrFailed(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
pool:
- vmImage: "Ubuntu-18.04"
+ vmImage: "Ubuntu-16.04"
jobs:
- job: SyncMooncake
displayName: Sync Mooncake
@@ -195,7 +194,7 @@ stages:
- macOSARM64
condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), or(eq(variables['VSCODE_RELEASE'], 'true'), and(or(eq(variables['VSCODE_QUALITY'], 'insider'), eq(variables['VSCODE_QUALITY'], 'exploration')), eq(variables['Build.Reason'], 'Schedule'))))
pool:
- vmImage: "Ubuntu-18.04"
+ vmImage: "Ubuntu-16.04"
jobs:
- job: BuildService
displayName: Build Service
diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index 66baef772c8..eaf0a65e8aa 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -17,7 +17,7 @@ steps:
- task: NodeTool@0
inputs:
- versionSpec: "12.18.3"
+ versionSpec: "12.14.1"
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
diff --git a/build/azure-pipelines/publish-types/publish-types.yml b/build/azure-pipelines/publish-types/publish-types.yml
index 0e3f4e4daa4..5f1cf6c28a4 100644
--- a/build/azure-pipelines/publish-types/publish-types.yml
+++ b/build/azure-pipelines/publish-types/publish-types.yml
@@ -9,7 +9,7 @@ pr: none
steps:
- task: NodeTool@0
inputs:
- versionSpec: "12.18.3"
+ versionSpec: "12.14.1"
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
inputs:
diff --git a/build/azure-pipelines/sync-mooncake.yml b/build/azure-pipelines/sync-mooncake.yml
index 280c9e6372d..109709418ff 100644
--- a/build/azure-pipelines/sync-mooncake.yml
+++ b/build/azure-pipelines/sync-mooncake.yml
@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
- versionSpec: "12.18.3"
+ versionSpec: "12.14.1"
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
inputs:
diff --git a/build/azure-pipelines/web/product-build-web.yml b/build/azure-pipelines/web/product-build-web.yml
index 1beae9506eb..33282adbe46 100644
--- a/build/azure-pipelines/web/product-build-web.yml
+++ b/build/azure-pipelines/web/product-build-web.yml
@@ -22,7 +22,7 @@ steps:
- task: NodeTool@0
inputs:
- versionSpec: "12.18.3"
+ versionSpec: "12.14.1"
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
inputs:
diff --git a/build/azure-pipelines/win32/continuous-build-win32.yml b/build/azure-pipelines/win32/continuous-build-win32.yml
index 7bd18707381..87b820cb009 100644
--- a/build/azure-pipelines/win32/continuous-build-win32.yml
+++ b/build/azure-pipelines/win32/continuous-build-win32.yml
@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
- versionSpec: "12.18.3"
+ versionSpec: "12.14.1"
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
inputs:
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index 5c8806401d5..1992ac1affb 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -22,7 +22,7 @@ steps:
- task: NodeTool@0
inputs:
- versionSpec: "12.18.3"
+ versionSpec: "12.14.1"
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
inputs:
diff --git a/build/darwin/sign.ts b/build/darwin/sign.ts
index f1908b14749..538dc97adf1 100644
--- a/build/darwin/sign.ts
+++ b/build/darwin/sign.ts
@@ -29,6 +29,7 @@ async function main(): Promise<void> {
const appFrameworkPath = path.join(appRoot, appName, 'Contents', 'Frameworks');
const helperAppBaseName = product.nameShort;
const gpuHelperAppName = helperAppBaseName + ' Helper (GPU).app';
+ const pluginHelperAppName = helperAppBaseName + ' Helper (Plugin).app';
const rendererHelperAppName = helperAppBaseName + ' Helper (Renderer).app';
const defaultOpts: codesign.SignOptions = {
@@ -50,6 +51,7 @@ async function main(): Promise<void> {
// TODO(deepak1556): Incorrectly declared type in electron-osx-sign
ignore: (filePath: string) => {
return filePath.includes(gpuHelperAppName) ||
+ filePath.includes(pluginHelperAppName) ||
filePath.includes(rendererHelperAppName);
}
};
@@ -61,6 +63,13 @@ async function main(): Promise<void> {
'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-gpu-entitlements.plist'),
};
+ const pluginHelperOpts: codesign.SignOptions = {
+ ...defaultOpts,
+ app: path.join(appFrameworkPath, pluginHelperAppName),
+ entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist'),
+ 'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist'),
+ };
+
const rendererHelperOpts: codesign.SignOptions = {
...defaultOpts,
app: path.join(appFrameworkPath, rendererHelperAppName),
@@ -69,6 +78,7 @@ async function main(): Promise<void> {
};
await codesign.signAsync(gpuHelperOpts);
+ await codesign.signAsync(pluginHelperOpts);
await codesign.signAsync(rendererHelperOpts);
await codesign.signAsync(appOpts as any);
}