Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev/mjbvz/mermaid-core

Browse Source
This commit is contained in:
Matt Bierner
2025-09-22 12:44:19 -07:00
committed by GitHub
parent 714de95111 31d762909e
commit 36713d57bf
296 changed files with 3859 additions and 21642 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/azure-pipelines/alpine/cli-build-alpine.yml
+2
View File
@@ -12,6 +12,8 @@ parameters:
default: false
steps:
- template: ../common/checkout.yml@self
- task: NodeTool@0
inputs:
versionSource: fromFile
build/azure-pipelines/alpine/product-build-alpine.yml
+2
View File
@@ -1,4 +1,6 @@
steps:
- template: ../common/checkout.yml@self
- task: NodeTool@0
inputs:
versionSource: fromFile
build/azure-pipelines/common/checkout.yml
+5
View File
@@ -0,0 +1,5 @@
steps:
- checkout: self
fetchDepth: 1
fetchTags: false
displayName: Checkout microsoft/vscode
build/azure-pipelines/common/publish-artifact.yml
-4
View File
@@ -18,9 +18,6 @@ parameters:
- name: sbomPackageVersion
type: string
default: ""
- name: isProduction
type: boolean
default: true
- name: condition
type: string
default: succeeded()
@@ -80,7 +77,6 @@ steps:
targetPath: ${{ parameters.targetPath }}
artifactName: $(ARTIFACT_NAME)
sbomEnabled: ${{ parameters.sbomEnabled }}
isProduction: ${{ parameters.isProduction }}
${{ if ne(parameters.sbomBuildDropPath, '') }}:
sbomBuildDropPath: ${{ parameters.sbomBuildDropPath }}
${{ if ne(parameters.sbomPackageName, '') }}:
build/azure-pipelines/darwin/cli-build-darwin.yml
+4 -6
View File
@@ -12,6 +12,8 @@ parameters:
default: false
steps:
- template: ../common/checkout.yml@self
- task: NodeTool@0
inputs:
versionSource: fromFile
@@ -71,9 +73,7 @@ steps:
targetPath: $(Build.ArtifactStagingDirectory)/unsigned_vscode_cli_darwin_x64_cli.zip
artifactName: unsigned_vscode_cli_darwin_x64_cli
displayName: Publish unsigned_vscode_cli_darwin_x64_cli artifact
sbomBuildDropPath: $(Build.ArtifactStagingDirectory)/cli
sbomPackageName: "VS Code macOS x64 CLI (unsigned)"
sbomPackageVersion: $(Build.SourceVersion)
sbomEnabled: false
- ${{ if eq(parameters.VSCODE_BUILD_MACOS_ARM64, true) }}:
- template: ../common/publish-artifact.yml@self
@@ -81,6 +81,4 @@ steps:
targetPath: $(Build.ArtifactStagingDirectory)/unsigned_vscode_cli_darwin_arm64_cli.zip
artifactName: unsigned_vscode_cli_darwin_arm64_cli
displayName: Publish unsigned_vscode_cli_darwin_arm64_cli artifact
sbomBuildDropPath: $(Build.ArtifactStagingDirectory)/cli
sbomPackageName: "VS Code macOS arm64 CLI (unsigned)"
sbomPackageVersion: $(Build.SourceVersion)
sbomEnabled: false
build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml
+2
View File
@@ -5,6 +5,8 @@ parameters:
type: boolean
steps:
- template: ../common/checkout.yml@self
- task: NodeTool@0
inputs:
versionSource: fromFile
build/azure-pipelines/darwin/product-build-darwin-test.yml
-3
View File
@@ -132,7 +132,6 @@ steps:
${{ else }}:
artifactName: crash-dump-macos-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
displayName: "Publish Crash Reports"
isProduction: false
sbomEnabled: false
continueOnError: true
condition: failed()
@@ -147,7 +146,6 @@ steps:
${{ else }}:
artifactName: node-modules-macos-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
displayName: "Publish Node Modules"
isProduction: false
sbomEnabled: false
continueOnError: true
condition: failed()
@@ -160,7 +158,6 @@ steps:
${{ else }}:
artifactName: logs-macos-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
displayName: "Publish Log Files"
isProduction: false
sbomEnabled: false
continueOnError: true
condition: succeededOrFailed()
build/azure-pipelines/darwin/product-build-darwin-universal.yml
+2
View File
@@ -1,4 +1,6 @@
steps:
- template: ../common/checkout.yml@self
- task: NodeTool@0
inputs:
versionSource: fromFile
build/azure-pipelines/darwin/product-build-darwin.yml
+2
View File
@@ -17,6 +17,8 @@ parameters:
default: ""
steps:
- template: ../common/checkout.yml@self
- task: NodeTool@0
inputs:
versionSource: fromFile
build/azure-pipelines/linux/cli-build-linux.yml
+2
View File
@@ -15,6 +15,8 @@ parameters:
type: string
steps:
- template: ../common/checkout.yml@self
- task: NodeTool@0
inputs:
versionSource: fromFile
build/azure-pipelines/linux/product-build-linux-test.yml
-3
View File
@@ -147,7 +147,6 @@ steps:
${{ else }}:
artifactName: crash-dump-linux-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
displayName: "Publish Crash Reports"
isProduction: false
sbomEnabled: false
continueOnError: true
condition: failed()
@@ -162,7 +161,6 @@ steps:
${{ else }}:
artifactName: node-modules-linux-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
displayName: "Publish Node Modules"
isProduction: false
sbomEnabled: false
continueOnError: true
condition: failed()
@@ -175,7 +173,6 @@ steps:
${{ else }}:
artifactName: logs-linux-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
displayName: "Publish Log Files"
isProduction: false
sbomEnabled: false
continueOnError: true
condition: succeededOrFailed()
build/azure-pipelines/linux/product-build-linux.yml
+2
View File
@@ -22,6 +22,8 @@ parameters:
default: ""
steps:
- template: ../common/checkout.yml@self
- task: NodeTool@0
inputs:
versionSource: fromFile
build/azure-pipelines/product-build.yml
+6 -7
View File
@@ -265,8 +265,7 @@ extends:
- ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
- job: CLIMacOSX64
pool:
name: Azure Pipelines
image: macOS-13
name: AcesShared
os: macOS
variables:
# todo@connor4312 to diagnose build flakes
@@ -282,8 +281,7 @@ extends:
- ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}:
- job: CLIMacOSARM64
pool:
name: Azure Pipelines
image: macOS-13
name: AcesShared
os: macOS
variables:
# todo@connor4312 to diagnose build flakes
@@ -676,6 +674,9 @@ extends:
displayName: Publish Build
steps:
- template: build/azure-pipelines/product-publish.yml@self
parameters:
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
VSCODE_SCHEDULEDBUILD: ${{ variables.VSCODE_SCHEDULEDBUILD }}
- ${{ if and(parameters.VSCODE_RELEASE, eq(variables['VSCODE_PRIVATE_BUILD'], false)) }}:
- stage: ApproveRelease
@@ -691,12 +692,10 @@ extends:
- name: skipComponentGovernanceDetection
value: true
- ${{ if or(and(parameters.VSCODE_RELEASE, eq(variables['VSCODE_PRIVATE_BUILD'], false)), and(in(parameters.VSCODE_QUALITY, 'insider', 'exploration'), eq(variables['VSCODE_SCHEDULEDBUILD'], true))) }}:
- stage: Release
dependsOn:
- Publish
- ${{ if and(parameters.VSCODE_RELEASE, eq(variables['VSCODE_PRIVATE_BUILD'], false)) }}:
- ApproveRelease
- ApproveRelease
pool:
name: 1es-ubuntu-22.04-x64
os: linux
build/azure-pipelines/product-compile.yml
+2
View File
@@ -1,4 +1,6 @@
steps:
- template: ./common/checkout.yml@self
- task: NodeTool@0
inputs:
versionSource: fromFile
build/azure-pipelines/product-publish.yml
+16
View File
@@ -1,4 +1,12 @@
parameters:
- name: VSCODE_QUALITY
type: string
- name: VSCODE_SCHEDULEDBUILD
type: boolean
steps:
- template: ./common/checkout.yml@self
- task: NodeTool@0
inputs:
versionSource: fromFile
@@ -93,3 +101,11 @@ steps:
displayName: Publish the artifacts processed for this stage attempt
sbomEnabled: false
condition: always()
- ${{ if and(in(parameters.VSCODE_QUALITY, 'insider', 'exploration'), eq(parameters.VSCODE_SCHEDULEDBUILD, true)) }}:
- script: node build/azure-pipelines/common/releaseBuild.js
env:
AZURE_TENANT_ID: "$(AZURE_TENANT_ID)"
AZURE_CLIENT_ID: "$(AZURE_CLIENT_ID)"
AZURE_ID_TOKEN: "$(AZURE_ID_TOKEN)"
displayName: Release build
build/azure-pipelines/product-release.yml
+2
View File
@@ -3,6 +3,8 @@ parameters:
type: boolean
steps:
- template: ./common/checkout.yml@self
- task: NodeTool@0
inputs:
versionSource: fromFile
build/azure-pipelines/web/product-build-web.yml
+2
View File
@@ -1,4 +1,6 @@
steps:
- template: ../common/checkout.yml@self
- task: NodeTool@0
inputs:
versionSource: fromFile
build/azure-pipelines/win32/cli-build-win32.yml
+4 -6
View File
@@ -12,6 +12,8 @@ parameters:
type: string
steps:
- template: ../common/checkout.yml@self
- task: NodeTool@0
inputs:
versionSource: fromFile
@@ -74,9 +76,7 @@ steps:
targetPath: $(Build.ArtifactStagingDirectory)/unsigned_vscode_cli_win32_arm64_cli.zip
artifactName: unsigned_vscode_cli_win32_arm64_cli
displayName: Publish unsigned_vscode_cli_win32_arm64_cli artifact
sbomBuildDropPath: $(Build.ArtifactStagingDirectory)/cli
sbomPackageName: "VS Code Windows arm64 CLI (unsigned)"
sbomPackageVersion: $(Build.SourceVersion)
sbomEnabled: false
- ${{ if eq(parameters.VSCODE_BUILD_WIN32, true) }}:
- template: ../common/publish-artifact.yml@self
@@ -84,6 +84,4 @@ steps:
targetPath: $(Build.ArtifactStagingDirectory)/unsigned_vscode_cli_win32_x64_cli.zip
artifactName: unsigned_vscode_cli_win32_x64_cli
displayName: Publish unsigned_vscode_cli_win32_x64_cli artifact
sbomBuildDropPath: $(Build.ArtifactStagingDirectory)/cli
sbomPackageName: "VS Code Windows x64 CLI (unsigned)"
sbomPackageVersion: $(Build.SourceVersion)
sbomEnabled: false
build/azure-pipelines/win32/product-build-win32-cli-sign.yml
+2
View File
@@ -5,6 +5,8 @@ parameters:
type: boolean
steps:
- template: ../common/checkout.yml@self
- task: NodeTool@0
displayName: "Use Node.js"
inputs:
build/azure-pipelines/win32/product-build-win32-test.yml
-3
View File
@@ -149,7 +149,6 @@ steps:
artifactName: crash-dump-windows-$(VSCODE_ARCH)-$(System.JobAttempt)
${{ else }}:
artifactName: crash-dump-windows-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
isProduction: false
sbomEnabled: false
displayName: "Publish Crash Reports"
continueOnError: true
@@ -164,7 +163,6 @@ steps:
artifactName: node-modules-windows-$(VSCODE_ARCH)-$(System.JobAttempt)
${{ else }}:
artifactName: node-modules-windows-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
isProduction: false
sbomEnabled: false
displayName: "Publish Node Modules"
continueOnError: true
@@ -177,7 +175,6 @@ steps:
artifactName: logs-windows-$(VSCODE_ARCH)-$(System.JobAttempt)
${{ else }}:
artifactName: logs-windows-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
isProduction: false
sbomEnabled: false
displayName: "Publish Log Files"
continueOnError: true
build/azure-pipelines/win32/product-build-win32.yml
+2
View File
@@ -19,6 +19,8 @@ parameters:
default: ""
steps:
- template: ../common/checkout.yml@self
- task: NodeTool@0
inputs:
versionSource: fromFile
build/azure-pipelines/win32/sdl-scan-win32.yml
+2
View File
@@ -5,6 +5,8 @@ parameters:
type: string
steps:
- template: ../common/checkout.yml@self
- task: NodeTool@0
inputs:
versionSource: fromFile
build/npm/mixin-telemetry-docs.mjs
+34
View File
@@ -0,0 +1,34 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { execSync } from 'child_process';
import { join, resolve } from 'path';
import { existsSync, rmSync } from 'fs';
import { fileURLToPath } from 'url';
const rootPath = resolve(fileURLToPath(import.meta.url), '..', '..', '..');
const telemetryDocsPath = join(rootPath, 'vscode-telemetry-docs');
const repoUrl = 'https://github.com/microsoft/vscode-telemetry-docs';
console.log('Cloning vscode-telemetry-docs repository...');
// Remove existing directory if it exists
if (existsSync(telemetryDocsPath)) {
console.log('Removing existing vscode-telemetry-docs directory...');
rmSync(telemetryDocsPath, { recursive: true, force: true });
}
try {
// Clone the repository (shallow clone of main branch only)
console.log(`Cloning ${repoUrl} to ${telemetryDocsPath}...`);
execSync(`git clone --depth 1 --branch main --single-branch ${repoUrl} vscode-telemetry-docs`, {
cwd: rootPath,
stdio: 'inherit'
});
console.log('Successfully cloned vscode-telemetry-docs repository.');
} catch (error) {
console.error('Failed to clone vscode-telemetry-docs repository:', error.message);
process.exit(1);
}