This commit is contained in:
Robo 2024-08-06 21:57:22 +09:00 коммит произвёл GitHub
Родитель 05f1442ab0
Коммит 1835a67cb6
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
6 изменённых файлов: 5 добавлений и 18 удалений

Просмотреть файл

@ -1 +1 @@
2024-07-04T16:31:11.121Z
2024-08-06T11:06:57.600Z

Просмотреть файл

@ -389,14 +389,8 @@ function getPlatform(product, os, arch, type, isLegacy) {
}
}
case 'server':
if (arch === 'arm64') {
throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
}
return `server-win32-${arch}`;
case 'web':
if (arch === 'arm64') {
throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
}
return `server-win32-${arch}-web`;
case 'cli':
return `cli-win32-${arch}`;

Просмотреть файл

@ -550,14 +550,8 @@ function getPlatform(product: string, os: string, arch: string, type: string, is
}
}
case 'server':
if (arch === 'arm64') {
throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
}
return `server-win32-${arch}`;
case 'web':
if (arch === 'arm64') {
throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
}
return `server-win32-${arch}-web`;
case 'cli':
return `cli-win32-${arch}`;

Просмотреть файл

@ -184,7 +184,6 @@ steps:
env:
GITHUB_TOKEN: "$(github-distro-mixin-password)"
displayName: Build server
condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
- powershell: |
. build/azure-pipelines/win32/exec.ps1
@ -195,7 +194,6 @@ steps:
env:
GITHUB_TOKEN: "$(github-distro-mixin-password)"
displayName: Build server (web)
condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
- ${{ if or(eq(parameters.VSCODE_RUN_UNIT_TESTS, true), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
- template: product-build-win32-test.yml@self
@ -336,7 +334,7 @@ steps:
sbomBuildDropPath: $(Agent.BuildDirectory)/vscode-server-win32-$(VSCODE_ARCH)
sbomPackageName: "VS Code Windows $(VSCODE_ARCH) Server"
sbomPackageVersion: $(Build.SourceVersion)
condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''), ne(variables['VSCODE_ARCH'], 'arm64'))
condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''))
displayName: Publish server archive
- task: 1ES.PublishPipelineArtifact@1
@ -346,7 +344,7 @@ steps:
sbomBuildDropPath: $(Agent.BuildDirectory)/vscode-server-win32-$(VSCODE_ARCH)-web
sbomPackageName: "VS Code Windows $(VSCODE_ARCH) Web"
sbomPackageVersion: $(Build.SourceVersion)
condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''), ne(variables['VSCODE_ARCH'], 'arm64'))
condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''))
displayName: Publish web server archive
- task: 1ES.PublishPipelineArtifact@1

Просмотреть файл

@ -41,6 +41,7 @@ const REMOTE_FOLDER = path.join(REPO_ROOT, 'remote');
const BUILD_TARGETS = [
{ platform: 'win32', arch: 'x64' },
{ platform: 'win32', arch: 'arm64' },
{ platform: 'darwin', arch: 'x64' },
{ platform: 'darwin', arch: 'arm64' },
{ platform: 'linux', arch: 'x64' },

Просмотреть файл

@ -250,7 +250,7 @@ impl Platform {
Platform::DarwinARM64 => "server-darwin-arm64",
Platform::WindowsX64 => "server-win32-x64",
Platform::WindowsX86 => "server-win32",
Platform::WindowsARM64 => "server-win32-x64", // we don't publish an arm64 server build yet
Platform::WindowsARM64 => "server-win32-arm64",
}
.to_owned()
}