Skip to content

Commit 6b2b7e1

Browse files
meganroggemeganrogge
committed
Merge branch 'main' into merogge/editor-h
2 parents e6a59df + 908b24d commit 6b2b7e1

File tree

82 files changed

+706
-617
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+706
-617
lines changed

‎build/azure-pipelines/cli/cli-compile-and-publish.yml

Lines changed: 51 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,37 @@ parameters:
66
- name: VSCODE_CLI_ENV
77
type: object
88
default: {}
9+
- name: VSCODE_CHECK_ONLY
10+
type: boolean
911

1012
steps:
11-
- script: cargo build --release --target ${{ parameters.VSCODE_CLI_TARGET }} --bin=code
12-
displayName: Compile ${{ parameters.VSCODE_CLI_TARGET }}
13-
workingDirectory: $(Build.SourcesDirectory)/cli
14-
env:
15-
CARGO_NET_GIT_FETCH_WITH_CLI: true
16-
${{ each pair in parameters.VSCODE_CLI_ENV }}:
17-
${{ pair.key }}: ${{ pair.value }}
18-
19-
- ${{ if contains(parameters.VSCODE_CLI_TARGET, '-windows-') }}:
20-
- powershell: |
21-
. build/azure-pipelines/win32/exec.ps1
22-
$ErrorActionPreference = "Stop"
23-
Move-Item -Path $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code.exe -Destination "$(Build.ArtifactStagingDirectory)/${env:VSCODE_CLI_APPLICATION_NAME}.exe"
24-
25-
- task: ArchiveFiles@2
26-
inputs:
27-
rootFolderOrFile: $(Build.ArtifactStagingDirectory)/$(VSCODE_CLI_APPLICATION_NAME).exe
28-
includeRootFolder: false
29-
archiveType: zip
30-
archiveFile: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.zip
31-
32-
- publish: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.zip
33-
artifact: ${{ parameters.VSCODE_CLI_ARTIFACT }}
34-
displayName: Publish ${{ parameters.VSCODE_CLI_ARTIFACT }} artifact
13+
- ${{ if parameters.VSCODE_CHECK_ONLY }}:
14+
- script: rustup component add clippy && cargo clippy --target ${{ parameters.VSCODE_CLI_TARGET }} --bin=code
15+
displayName: Lint ${{ parameters.VSCODE_CLI_TARGET }}
16+
workingDirectory: $(Build.SourcesDirectory)/cli
17+
env:
18+
CARGO_NET_GIT_FETCH_WITH_CLI: true
19+
${{ each pair in parameters.VSCODE_CLI_ENV }}:
20+
${{ pair.key }}: ${{ pair.value }}
3521

3622
- ${{ else }}:
37-
- script: |
38-
set -e
39-
mv $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code $(Build.ArtifactStagingDirectory)/$(VSCODE_CLI_APPLICATION_NAME)
23+
- script: cargo build --release --target ${{ parameters.VSCODE_CLI_TARGET }} --bin=code
24+
displayName: Compile ${{ parameters.VSCODE_CLI_TARGET }}
25+
workingDirectory: $(Build.SourcesDirectory)/cli
26+
env:
27+
CARGO_NET_GIT_FETCH_WITH_CLI: true
28+
${{ each pair in parameters.VSCODE_CLI_ENV }}:
29+
${{ pair.key }}: ${{ pair.value }}
30+
31+
- ${{ if contains(parameters.VSCODE_CLI_TARGET, '-windows-') }}:
32+
- powershell: |
33+
. build/azure-pipelines/win32/exec.ps1
34+
$ErrorActionPreference = "Stop"
35+
Move-Item -Path $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code.exe -Destination "$(Build.ArtifactStagingDirectory)/${env:VSCODE_CLI_APPLICATION_NAME}.exe"
4036
41-
- ${{ if contains(parameters.VSCODE_CLI_TARGET, '-darwin') }}:
4237
- task: ArchiveFiles@2
4338
inputs:
44-
rootFolderOrFile: $(Build.ArtifactStagingDirectory)/$(VSCODE_CLI_APPLICATION_NAME)
39+
rootFolderOrFile: $(Build.ArtifactStagingDirectory)/$(VSCODE_CLI_APPLICATION_NAME).exe
4540
includeRootFolder: false
4641
archiveType: zip
4742
archiveFile: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.zip
@@ -51,14 +46,31 @@ steps:
5146
displayName: Publish ${{ parameters.VSCODE_CLI_ARTIFACT }} artifact
5247

5348
- ${{ else }}:
54-
- task: ArchiveFiles@2
55-
inputs:
56-
rootFolderOrFile: $(Build.ArtifactStagingDirectory)/$(VSCODE_CLI_APPLICATION_NAME)
57-
includeRootFolder: false
58-
archiveType: tar
59-
tarCompression: gz
60-
archiveFile: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.tar.gz
49+
- script: |
50+
set -e
51+
mv $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code $(Build.ArtifactStagingDirectory)/$(VSCODE_CLI_APPLICATION_NAME)
6152
62-
- publish: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.tar.gz
63-
artifact: ${{ parameters.VSCODE_CLI_ARTIFACT }}
64-
displayName: Publish ${{ parameters.VSCODE_CLI_ARTIFACT }} artifact
53+
- ${{ if contains(parameters.VSCODE_CLI_TARGET, '-darwin') }}:
54+
- task: ArchiveFiles@2
55+
inputs:
56+
rootFolderOrFile: $(Build.ArtifactStagingDirectory)/$(VSCODE_CLI_APPLICATION_NAME)
57+
includeRootFolder: false
58+
archiveType: zip
59+
archiveFile: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.zip
60+
61+
- publish: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.zip
62+
artifact: ${{ parameters.VSCODE_CLI_ARTIFACT }}
63+
displayName: Publish ${{ parameters.VSCODE_CLI_ARTIFACT }} artifact
64+
65+
- ${{ else }}:
66+
- task: ArchiveFiles@2
67+
inputs:
68+
rootFolderOrFile: $(Build.ArtifactStagingDirectory)/$(VSCODE_CLI_APPLICATION_NAME)
69+
includeRootFolder: false
70+
archiveType: tar
71+
tarCompression: gz
72+
archiveFile: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.tar.gz
73+
74+
- publish: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.tar.gz
75+
artifact: ${{ parameters.VSCODE_CLI_ARTIFACT }}
76+
displayName: Publish ${{ parameters.VSCODE_CLI_ARTIFACT }} artifact

‎build/azure-pipelines/cli/prepare.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/azure-pipelines/cli/prepare.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ const makeQualityMap = <T>(m: (productJson: any, quality: string) => T): Record<
3838
*/
3939
const setLauncherEnvironmentVars = () => {
4040
const vars = new Map([
41+
['VSCODE_CLI_ALREADY_PREPARED', 'true'],
4142
['VSCODE_CLI_REMOTE_LICENSE_TEXT', product.serverLicense?.join('\\n')],
4243
['VSCODE_CLI_REMOTE_LICENSE_PROMPT', product.serverLicensePrompt],
4344
['VSCODE_CLI_AI_KEY', product.aiConfig?.cliKey],

‎build/azure-pipelines/darwin/cli-build-darwin.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ parameters:
77
- name: VSCODE_BUILD_MACOS_ARM64
88
type: boolean
99
default: false
10+
- name: VSCODE_CHECK_ONLY
11+
type: boolean
12+
default: false
1013

1114
steps:
1215
- task: NodeTool@0
@@ -51,6 +54,7 @@ steps:
5154
parameters:
5255
VSCODE_CLI_TARGET: x86_64-apple-darwin
5356
VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_darwin_x64_cli
57+
VSCODE_CHECK_ONLY: ${{ parameters.VSCODE_CHECK_ONLY }}
5458
VSCODE_CLI_ENV:
5559
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-osx/lib
5660
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-osx/include
@@ -60,6 +64,7 @@ steps:
6064
parameters:
6165
VSCODE_CLI_TARGET: aarch64-apple-darwin
6266
VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_darwin_arm64_cli
67+
VSCODE_CHECK_ONLY: ${{ parameters.VSCODE_CHECK_ONLY }}
6368
VSCODE_CLI_ENV:
6469
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-osx/lib
6570
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-osx/include

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ parameters:
88
- name: VSCODE_BUILD_LINUX_ARMHF
99
type: boolean
1010
default: false
11+
- name: VSCODE_CHECK_ONLY
12+
type: boolean
13+
default: false
1114
- name: VSCODE_QUALITY
1215
type: string
1316

@@ -64,6 +67,7 @@ steps:
6467
parameters:
6568
VSCODE_CLI_TARGET: aarch64-unknown-linux-gnu
6669
VSCODE_CLI_ARTIFACT: vscode_cli_linux_arm64_cli
70+
VSCODE_CHECK_ONLY: ${{ parameters.VSCODE_CHECK_ONLY }}
6771
VSCODE_CLI_ENV:
6872
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
6973
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/lib
@@ -74,6 +78,7 @@ steps:
7478
parameters:
7579
VSCODE_CLI_TARGET: x86_64-unknown-linux-gnu
7680
VSCODE_CLI_ARTIFACT: vscode_cli_linux_x64_cli
81+
VSCODE_CHECK_ONLY: ${{ parameters.VSCODE_CHECK_ONLY }}
7782
VSCODE_CLI_ENV:
7883
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/lib
7984
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/include
@@ -83,6 +88,7 @@ steps:
8388
parameters:
8489
VSCODE_CLI_TARGET: armv7-unknown-linux-gnueabihf
8590
VSCODE_CLI_ARTIFACT: vscode_cli_linux_armhf_cli
91+
VSCODE_CHECK_ONLY: ${{ parameters.VSCODE_CHECK_ONLY }}
8692
VSCODE_CLI_ENV:
8793
CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc
8894
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm-linux/lib

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ stages:
176176
steps:
177177
- template: ./linux/cli-build-linux.yml
178178
parameters:
179+
VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }}
179180
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
180181
VSCODE_BUILD_LINUX: ${{ parameters.VSCODE_BUILD_LINUX }}
181182

@@ -216,6 +217,7 @@ stages:
216217
steps:
217218
- template: ./darwin/cli-build-darwin.yml
218219
parameters:
220+
VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }}
219221
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
220222
VSCODE_BUILD_MACOS: ${{ parameters.VSCODE_BUILD_MACOS }}
221223

@@ -235,6 +237,7 @@ stages:
235237
steps:
236238
- template: ./win32/cli-build-win32.yml
237239
parameters:
240+
VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }}
238241
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
239242
VSCODE_BUILD_WIN32: ${{ parameters.VSCODE_BUILD_WIN32 }}
240243

0 commit comments

Comments
 (0)