Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,9 @@ jobs:
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
displayName: Setup NPM Authentication

- template: ../common/foundry-local.yml@self
parameters:
phase: prepare
onlyOnNodeModulesCacheMiss: true
- task: NuGetAuthenticate@1
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
displayName: Setup NuGet Authentication

- task: Docker@1
inputs:
Expand Down Expand Up @@ -131,17 +130,14 @@ jobs:
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
GITHUB_TOKEN: "$(github-token-code-oss)"
FOUNDRY_LOCAL_NUGET_MODE: dotnet
FOUNDRY_LOCAL_NUGET_FEEDS: "https://pkgs.dev.azure.com/monacotools/Monaco/_packaging/vscode/nuget/v3/index.json"
VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME: vscodehub.azurecr.io/vscode-linux-build-agent:alpine-$(VSCODE_ARCH)
VSCODE_HOST_MOUNT: "/mnt/vss/_work/1/s"
VSCODE_NPMRC_PATH: $(NPMRC_PATH)
displayName: Install dependencies
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

- template: ../common/foundry-local.yml@self
parameters:
phase: install
onlyOnNodeModulesCacheMiss: true

- script: node build/azure-pipelines/common/checkNativeOptionalDeps.ts
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
displayName: Verify native optional dependency binaries
Expand Down
11 changes: 4 additions & 7 deletions build/azure-pipelines/alpine/product-build-alpine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,8 @@ jobs:
condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
displayName: Setup NPM Authentication

- template: ../common/foundry-local.yml@self
parameters:
phase: prepare
- task: NuGetAuthenticate@1
displayName: Setup NuGet Authentication

- task: Docker@1
inputs:
Expand Down Expand Up @@ -175,16 +174,14 @@ jobs:
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
GITHUB_TOKEN: "$(github-token-code-oss)"
FOUNDRY_LOCAL_NUGET_MODE: dotnet
FOUNDRY_LOCAL_NUGET_FEEDS: "https://pkgs.dev.azure.com/monacotools/Monaco/_packaging/vscode/nuget/v3/index.json"
VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME: vscodehub.azurecr.io/vscode-linux-build-agent:alpine-$(VSCODE_ARCH)
VSCODE_HOST_MOUNT: "/mnt/vss/_work/1/s"
VSCODE_NPMRC_PATH: $(NPMRC_PATH)
displayName: Install dependencies
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

- template: ../common/foundry-local.yml@self
parameters:
phase: install

- script: node build/azure-pipelines/common/checkNativeOptionalDeps.ts
displayName: Verify native optional dependency binaries

Expand Down
16 changes: 11 additions & 5 deletions build/azure-pipelines/common/dictation-runtime-produce.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,23 @@ parameters:
# real publish runs (VSCODE_PUBLISH=true). darwin-x64 stamps but uploads
# nothing (the darwin-arm64 job publishes the shared Apple Silicon payload).
#
# The core libraries are fetched from NuGet for the target's explicit RID (see
# The ONNX libraries are fetched from NuGet for the target's explicit RID (see
# build/dictation-runtime/nuget.ts), so ARM64 targets build fine on x64 pools;
# the prebuilt addon is copied from the already-restored node_modules. No npm
# registry auth is needed.
# the addons and Foundry Local library are copied from the already-restored
# node_modules. No npm registry auth is needed.
#
# Steps:
# 1. AzureCLI@2 to fetch the SPN credentials for the CDN storage account —
# 1. NuGetAuthenticate@1 for the target-specific ONNX downloads — skipped on
# non-publish runs because no payload is produced.
# 2. AzureCLI@2 to fetch the SPN credentials for the CDN storage account —
# skipped on non-publish runs (no CDN write to auth for).
# 2. Run `node build/dictation-runtime/produce.ts`. Always stamps; uploads
# 3. Run `node build/dictation-runtime/produce.ts`. Always stamps; uploads
# only on publish.
steps:
- task: NuGetAuthenticate@1
displayName: "Dictation runtime: authenticate NuGet"
condition: and(succeeded(), eq(lower(variables['VSCODE_PUBLISH']), 'true'))

- task: AzureCLI@2
displayName: "Dictation runtime: fetch CDN credentials"
condition: and(succeeded(), eq(lower(variables['VSCODE_PUBLISH']), 'true'))
Expand Down
8 changes: 0 additions & 8 deletions build/azure-pipelines/common/disableFoundryLocalInstall.ts

This file was deleted.

27 changes: 0 additions & 27 deletions build/azure-pipelines/common/foundry-local.yml

This file was deleted.

121 changes: 0 additions & 121 deletions build/azure-pipelines/common/foundryLocalInstall.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,6 @@ jobs:
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
displayName: Setup PyPI Authentication

- template: ../common/foundry-local.yml@self
parameters:
phase: prepare
onlyOnNodeModulesCacheMiss: true

- script: |
set -e
c++ --version
Expand All @@ -99,6 +94,7 @@ jobs:
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
GITHUB_TOKEN: "$(github-token-code-oss)"
FOUNDRY_LOCAL_SKIP_INSTALL: "1"
# Avoid using dlopen to load Kerberos on macOS which can cause missing libraries
# https://github.com/mongodb-js/kerberos/commit/04044d2814ad1d01e77f1ce87f26b03d86692cf2
# flipped the default to support legacy linux distros which shouldn't happen
Expand All @@ -107,11 +103,6 @@ jobs:
displayName: Install dependencies
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

- template: ../common/foundry-local.yml@self
parameters:
phase: install
onlyOnNodeModulesCacheMiss: true

- script: node build/azure-pipelines/common/checkNativeOptionalDeps.ts
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
displayName: Verify native optional dependency binaries
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ steps:
versionSource: fromFile
versionFilePath: .nvmrc

- ${{ if or(eq(parameters.VSCODE_CIBUILD, true), eq(parameters.VSCODE_SKIP_FOUNDRY_LOCAL_INSTALL, true)) }}:
- script: node build/azure-pipelines/common/disableFoundryLocalInstall.ts
displayName: Disable Foundry Local Native Install

- template: ../../distro/download-distro.yml@self

- task: AzureKeyVault@2
Expand Down Expand Up @@ -87,9 +83,8 @@ steps:
displayName: Setup NPM Authentication

- ${{ if and(eq(parameters.VSCODE_CIBUILD, false), eq(parameters.VSCODE_SKIP_FOUNDRY_LOCAL_INSTALL, false)) }}:
- template: ../../common/foundry-local.yml@self
parameters:
phase: prepare
- task: NuGetAuthenticate@1
displayName: Setup NuGet Authentication

- task: PipAuthenticate@1
inputs:
Expand All @@ -115,6 +110,11 @@ steps:
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
GITHUB_TOKEN: "$(github-token-code-oss)"
${{ if or(eq(parameters.VSCODE_CIBUILD, true), eq(parameters.VSCODE_SKIP_FOUNDRY_LOCAL_INSTALL, true)) }}:
FOUNDRY_LOCAL_SKIP_INSTALL: "1"
${{ else }}:
FOUNDRY_LOCAL_NUGET_MODE: dotnet
FOUNDRY_LOCAL_NUGET_FEEDS: "https://pkgs.dev.azure.com/monacotools/Monaco/_packaging/vscode/nuget/v3/index.json"
# Avoid using dlopen to load Kerberos on macOS which can cause missing libraries
# https://github.com/mongodb-js/kerberos/commit/04044d2814ad1d01e77f1ce87f26b03d86692cf2
# flipped the default to support legacy linux distros which shouldn't happen
Expand All @@ -123,11 +123,6 @@ steps:
displayName: Install dependencies
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

- ${{ if and(eq(parameters.VSCODE_CIBUILD, false), eq(parameters.VSCODE_SKIP_FOUNDRY_LOCAL_INSTALL, false)) }}:
- template: ../../common/foundry-local.yml@self
parameters:
phase: install

- script: node build/azure-pipelines/common/checkNativeOptionalDeps.ts
displayName: Verify native optional dependency binaries

Expand Down
11 changes: 1 addition & 10 deletions build/azure-pipelines/linux/product-build-linux-node-modules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,6 @@ jobs:
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
displayName: Setup NPM Authentication

- template: ../common/foundry-local.yml@self
parameters:
phase: prepare
onlyOnNodeModulesCacheMiss: true

- script: |
set -e

Expand Down Expand Up @@ -144,14 +139,10 @@ jobs:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
ONNXRUNTIME_NODE_INSTALL: skip
GITHUB_TOKEN: "$(github-token-code-oss)"
FOUNDRY_LOCAL_SKIP_INSTALL: "1"
displayName: Install dependencies
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

- template: ../common/foundry-local.yml@self
parameters:
phase: install
onlyOnNodeModulesCacheMiss: true

- script: node build/azure-pipelines/common/checkNativeOptionalDeps.ts
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
displayName: Verify native optional dependency binaries
Expand Down
Loading
Loading