Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 06fa68a

Browse files
author
Eclipse Che Sync
committed
Rebase against the upstream 5b0a880
vscode-upstream-sha1: 5b0a880
2 parents e9837e1 + 5b0a880 commit 06fa68a

36 files changed

Lines changed: 240 additions & 203 deletions

File tree

‎code/.github/classifier.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"file-io": {"assign": ["bpasero"]},
8989
"file-nesting": {"assign": ["lramos15"]},
9090
"file-watcher": {"assign": ["bpasero"]},
91-
"font-rendering": {"assign": []},
91+
"font-rendering": {"assign": ["rzhao271"]},
9292
"formatting": {"assign": ["jrieken"]},
9393
"getting-started": {"assign": ["bhavyaus"]},
9494
"ghost-text": {"assign": ["hediet"]},
@@ -265,7 +265,7 @@
265265
"virtual-workspaces": {"assign": []},
266266
"vscode.dev": {"assign": []},
267267
"vscode-build": {"assign": []},
268-
"vscode-website": {"assign": []},
268+
"vscode-website": {"assign": ["rzhao271"]},
269269
"web": {"assign": []},
270270
"webview": {"assign": ["mjbvz"]},
271271
"webview-views": {"assign": ["mjbvz"]},

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
parameters:
2-
- name: VSCODE_BUILD_ALPINE
2+
- name: VSCODE_BUILD_LINUX_ALPINE
33
type: boolean
44
default: false
55
- name: VSCODE_BUILD_LINUX
66
type: boolean
77
default: false
8-
- name: VSCODE_BUILD_ALPINE_ARM64
8+
- name: VSCODE_BUILD_LINUX_ALPINE_ARM64
99
type: boolean
1010
default: false
1111
- name: VSCODE_BUILD_LINUX_ARM64
@@ -34,7 +34,7 @@ steps:
3434
displayName: Extract openssl prebuilt
3535
3636
# inspired by: https://github.com/emk/rust-musl-builder/blob/main/Dockerfile
37-
- ${{ if or(eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true), eq(parameters.VSCODE_BUILD_ALPINE, true)) }}:
37+
- ${{ if or(eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true)) }}:
3838
- bash: |
3939
set -e
4040
sudo apt-get update
@@ -72,9 +72,9 @@ steps:
7272
- template: ../cli/install-rust-posix.yml
7373
parameters:
7474
targets:
75-
- ${{ if eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true) }}:
75+
- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true) }}:
7676
- aarch64-unknown-linux-musl
77-
- ${{ if eq(parameters.VSCODE_BUILD_ALPINE, true) }}:
77+
- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true) }}:
7878
- x86_64-unknown-linux-musl
7979
- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
8080
- aarch64-unknown-linux-gnu
@@ -83,7 +83,7 @@ steps:
8383
- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}:
8484
- armv7-unknown-linux-gnueabihf
8585

86-
- ${{ if eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true) }}:
86+
- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true) }}:
8787
- template: ../cli/cli-compile-and-publish.yml
8888
parameters:
8989
VSCODE_CLI_TARGET: aarch64-unknown-linux-musl
@@ -94,7 +94,7 @@ steps:
9494
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/lib
9595
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/include
9696

97-
- ${{ if eq(parameters.VSCODE_BUILD_ALPINE, true) }}:
97+
- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true) }}:
9898
- template: ../cli/cli-compile-and-publish.yml
9999
parameters:
100100
VSCODE_CLI_TARGET: x86_64-unknown-linux-musl

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

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ parameters:
5353
displayName: "🎯 Linux armhf"
5454
type: boolean
5555
default: true
56-
- name: VSCODE_BUILD_ALPINE
57-
displayName: "🎯 Alpine x64"
56+
- name: VSCODE_BUILD_LINUX_ALPINE
57+
displayName: "🎯 Alpine Linux x64"
5858
type: boolean
5959
default: true
60-
- name: VSCODE_BUILD_ALPINE_ARM64
61-
displayName: "🎯 Alpine arm64"
60+
- name: VSCODE_BUILD_LINUX_ALPINE_ARM64
61+
displayName: "🎯 Alpine Linux arm64"
6262
type: boolean
6363
default: true
6464
- name: VSCODE_BUILD_MACOS
@@ -112,9 +112,7 @@ variables:
112112
- name: VSCODE_BUILD_STAGE_WINDOWS
113113
value: ${{ or(eq(parameters.VSCODE_BUILD_WIN32, true), eq(parameters.VSCODE_BUILD_WIN32_32BIT, true), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}
114114
- name: VSCODE_BUILD_STAGE_LINUX
115-
value: ${{ or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true)) }}
116-
- name: VSCODE_BUILD_STAGE_ALPINE
117-
value: ${{ or(eq(parameters.VSCODE_BUILD_ALPINE, true), eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true)) }}
115+
value: ${{ or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true)) }}
118116
- name: VSCODE_BUILD_STAGE_MACOS
119117
value: ${{ or(eq(parameters.VSCODE_BUILD_MACOS, true), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}
120118
- name: VSCODE_BUILD_STAGE_WEB
@@ -183,15 +181,15 @@ stages:
183181
- stage: CompileCLI
184182
dependsOn: []
185183
jobs:
186-
- ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_ALPINE, true)) }}:
184+
- ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true)) }}:
187185
- job: LinuxX64
188186
pool: vscode-1es-linux
189187
steps:
190188
- template: ./linux/cli-build-linux.yml
191189
parameters:
192190
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
193191
VSCODE_BUILD_LINUX: ${{ parameters.VSCODE_BUILD_LINUX }}
194-
VSCODE_BUILD_ALPINE: ${{ parameters.VSCODE_BUILD_ALPINE }}
192+
VSCODE_BUILD_LINUX_ALPINE: ${{ parameters.VSCODE_BUILD_LINUX_ALPINE }}
195193

196194
- ${{ if and(eq(variables['VSCODE_CIBUILD'], false), or(eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true))) }}:
197195
- job: LinuxGnuARM
@@ -203,7 +201,7 @@ stages:
203201
VSCODE_BUILD_LINUX_ARMHF: ${{ parameters.VSCODE_BUILD_LINUX_ARMHF }}
204202
VSCODE_BUILD_LINUX_ARM64: ${{ parameters.VSCODE_BUILD_LINUX_ARM64 }}
205203

206-
- ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true)) }}:
204+
- ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true)) }}:
207205
- job: LinuxAlpineARM64
208206
pool: vscode-1es-linux-20.04-arm64
209207
steps:
@@ -218,7 +216,7 @@ stages:
218216
- template: ./linux/cli-build-linux.yml
219217
parameters:
220218
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
221-
VSCODE_BUILD_ALPINE_ARM64: ${{ parameters.VSCODE_BUILD_ALPINE_ARM64 }}
219+
VSCODE_BUILD_LINUX_ALPINE_ARM64: ${{ parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64 }}
222220

223221
- ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
224222
- job: MacOSX64
@@ -539,22 +537,14 @@ stages:
539537
steps:
540538
- template: linux/snap-build-linux.yml
541539

542-
- ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_ALPINE'], true)) }}:
543-
- stage: Alpine
544-
dependsOn:
545-
- Compile
546-
- ${{ if eq(parameters.VSCODE_BUILD_TUNNEL_CLI, true) }}:
547-
- CompileCLI
548-
pool: vscode-1es-linux
549-
jobs:
550-
- ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_ALPINE, true)) }}:
540+
- ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true)) }}:
551541
- job: LinuxAlpine
552542
variables:
553543
VSCODE_ARCH: x64
554544
steps:
555545
- template: linux/product-build-alpine.yml
556546

557-
- ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true)) }}:
547+
- ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true)) }}:
558548
- job: LinuxAlpineArm64
559549
timeoutInMinutes: 120
560550
variables:

‎code/build/azure-pipelines/product-publish.ps1‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ New-Item -Path $ARTIFACT_PROCESSED_FILE_PATH -Force | Out-Null
4545
$stages = @(
4646
if ($env:VSCODE_BUILD_STAGE_WINDOWS -eq 'True') { 'Windows' }
4747
if ($env:VSCODE_BUILD_STAGE_LINUX -eq 'True') { 'Linux' }
48-
if ($env:VSCODE_BUILD_STAGE_ALPINE -eq 'True') { 'Alpine' }
4948
if ($env:VSCODE_BUILD_STAGE_MACOS -eq 'True') { 'macOS' }
5049
if ($env:VSCODE_BUILD_STAGE_WEB -eq 'True') { 'Web' }
5150
)

0 commit comments

Comments
 (0)