Skip to content

Commit 5191263

Browse files
authored
ci: fix installation of build dependencies (microsoft#239290) (microsoft#239303)
* ci: fix installation of build dependencies * ci: add missing quality parameter
1 parent c969d30 commit 5191263

9 files changed

+41
-3
lines changed

build/azure-pipelines/alpine/cli-build-alpine.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ steps:
1919
nodejsMirror: https://github.com/joaomoreno/node-mirror/releases/download
2020

2121
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
22+
- template: ../cli/cli-apply-patches.yml@self
23+
2224
- script: |
2325
set -e
2426
npm ci
2527
workingDirectory: build
26-
displayName: Install pipeline build
27-
28-
- template: ../cli/cli-apply-patches.yml@self
28+
env:
29+
GITHUB_TOKEN: "$(github-distro-mixin-password)"
30+
displayName: Install build dependencies
2931
3032
- task: Npm@1
3133
displayName: Download openssl prebuilt

build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ parameters:
33
type: boolean
44
- name: VSCODE_BUILD_MACOS_ARM64
55
type: boolean
6+
- name: VSCODE_QUALITY
7+
type: string
68

79
steps:
810
- task: NodeTool@0
@@ -11,6 +13,14 @@ steps:
1113
versionFilePath: .nvmrc
1214
nodejsMirror: https://github.com/joaomoreno/node-mirror/releases/download
1315

16+
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
17+
- task: AzureKeyVault@2
18+
displayName: "Azure Key Vault: Get Secrets"
19+
inputs:
20+
azureSubscription: vscode
21+
KeyVaultName: vscode-build-secrets
22+
SecretsFilter: "github-distro-mixin-password"
23+
1424
- script: node build/setup-npm-registry.js $NPM_REGISTRY build
1525
condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
1626
displayName: Setup NPM Registry
@@ -43,6 +53,8 @@ steps:
4353
echo "Npm install failed $i, trying again..."
4454
done
4555
workingDirectory: build
56+
env:
57+
GITHUB_TOKEN: "$(github-distro-mixin-password)"
4658
displayName: Install build dependencies
4759
4860
- template: ../cli/cli-darwin-sign.yml@self

build/azure-pipelines/darwin/product-build-darwin-universal.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ steps:
4646
echo "Npm install failed $i, trying again..."
4747
done
4848
workingDirectory: build
49+
env:
50+
GITHUB_TOKEN: "$(github-distro-mixin-password)"
4951
displayName: Install build dependencies
5052
5153
- download: current

build/azure-pipelines/linux/cli-build-linux.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ steps:
7272
echo "Npm install failed $i, trying again..."
7373
done
7474
workingDirectory: build
75+
env:
76+
GITHUB_TOKEN: "$(github-distro-mixin-password)"
7577
displayName: Install build dependencies
7678
7779
- script: |

build/azure-pipelines/linux/product-build-linux-legacy-server.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ steps:
9797
echo "Npm install failed $i, trying again..."
9898
done
9999
workingDirectory: build
100+
env:
101+
GITHUB_TOKEN: "$(github-distro-mixin-password)"
100102
displayName: Install build dependencies
101103
102104
- script: |

build/azure-pipelines/linux/product-build-linux.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ steps:
111111
echo "Npm install failed $i, trying again..."
112112
done
113113
workingDirectory: build
114+
env:
115+
GITHUB_TOKEN: "$(github-distro-mixin-password)"
114116
displayName: Install build dependencies
115117
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
116118

build/azure-pipelines/product-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,7 @@ extends:
406406
steps:
407407
- template: build/azure-pipelines/win32/product-build-win32-cli-sign.yml@self
408408
parameters:
409+
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
409410
VSCODE_BUILD_WIN32: ${{ parameters.VSCODE_BUILD_WIN32 }}
410411
VSCODE_BUILD_WIN32_ARM64: ${{ parameters.VSCODE_BUILD_WIN32_ARM64 }}
411412

@@ -706,6 +707,7 @@ extends:
706707
steps:
707708
- template: build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml@self
708709
parameters:
710+
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
709711
VSCODE_BUILD_MACOS: ${{ parameters.VSCODE_BUILD_MACOS }}
710712
VSCODE_BUILD_MACOS_ARM64: ${{ parameters.VSCODE_BUILD_MACOS_ARM64 }}
711713

build/azure-pipelines/product-publish.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ steps:
2626
- pwsh: |
2727
npm ci
2828
workingDirectory: build
29+
env:
30+
GITHUB_TOKEN: "$(github-distro-mixin-password)"
2931
displayName: Install build dependencies
3032
3133
- download: current

build/azure-pipelines/win32/product-build-win32-cli-sign.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ parameters:
33
type: boolean
44
- name: VSCODE_BUILD_WIN32_ARM64
55
type: boolean
6+
- name: VSCODE_QUALITY
7+
type: string
68

79
steps:
810
- task: NodeTool@0
@@ -12,6 +14,14 @@ steps:
1214
versionFilePath: .nvmrc
1315
nodejsMirror: https://github.com/joaomoreno/node-mirror/releases/download
1416

17+
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
18+
- task: AzureKeyVault@2
19+
displayName: "Azure Key Vault: Get Secrets"
20+
inputs:
21+
azureSubscription: vscode
22+
KeyVaultName: vscode-build-secrets
23+
SecretsFilter: "github-distro-mixin-password"
24+
1525
- powershell: node build/setup-npm-registry.js $env:NPM_REGISTRY build
1626
condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
1727
displayName: Setup NPM Registry
@@ -39,6 +49,8 @@ steps:
3949
$ErrorActionPreference = "Stop"
4050
exec { npm ci }
4151
workingDirectory: build
52+
env:
53+
GITHUB_TOKEN: "$(github-distro-mixin-password)"
4254
retryCountOnTaskFailure: 5
4355
displayName: Install build dependencies
4456

0 commit comments

Comments
 (0)