Skip to content

Commit b0d80c3

Browse files
amungeramunger
authored
Merge branch 'main' into aamunger/dirtyCustomEditors
2 parents c4ab63f + c59a7a2 commit b0d80c3

File tree

431 files changed

+8925
-3798
lines changed

Some content is hidden

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

431 files changed

+8925
-3798
lines changed

‎.github/workflows/no-yarn-lock-changes.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
- name: Get file changes
2525
uses: trilom/file-changes-action@ce38c8ce2459ca3c303415eec8cb0409857b4272
2626
if: ${{ steps.control.outputs.should_run == 'true' }}
27-
- name: Check for yarn.lock changes
27+
- name: Check for lockfile changes
2828
if: ${{ steps.control.outputs.should_run == 'true' }}
2929
run: |
30-
cat $HOME/files.json | jq -e 'any(test("yarn\\.lock$")) | not' \
31-
|| (echo "Changes to yarn.lock files aren't allowed in PRs." && exit 1)
30+
cat $HOME/files.json | jq -e 'any(test("yarn\\.lock$|Cargo\\.lock$")) | not' \
31+
|| (echo "Changes to yarn.lock/Cargo.lock files aren't allowed in PRs." && exit 1)

‎.vscode/notebooks/api.github-issues‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"June 2023\""
10+
"value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"July 2023\""
1111
},
1212
{
1313
"kind": 1,

‎.vscode/notebooks/endgame.github-issues‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"June 2023\""
10+
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"July 2023\""
1111
},
1212
{
1313
"kind": 1,

‎.vscode/notebooks/my-endgame.github-issues‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"June 2023\"\n\n$MINE=assignee:@me"
10+
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"July 2023\"\n\n$MINE=assignee:@me"
1111
},
1212
{
1313
"kind": 1,

‎.vscode/notebooks/verification.github-issues‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{
1313
"kind": 2,
1414
"language": "github-issues",
15-
"value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n$milestone=milestone:\"June 2023\""
15+
"value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n$milestone=milestone:\"July 2023\""
1616
},
1717
{
1818
"kind": 1,

‎.vscode/notebooks/vscode-dev.github-issues‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"kind": 2,
44
"language": "github-issues",
5-
"value": "$milestone=milestone:\"June 2023\""
5+
"value": "$milestone=milestone:\"July 2023\""
66
},
77
{
88
"kind": 1,

‎.vscode/settings.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"files.readonlyInclude": {
3737
"**/node_modules/**": true,
3838
"**/yarn.lock": true,
39+
"**/Cargo.lock": true,
3940
"src/vs/workbench/workbench.web.main.css": true,
4041
"src/vs/workbench/workbench.desktop.main.css": true,
4142
"src/vs/workbench/workbench.desktop.main.nls.js": true,
@@ -135,6 +136,7 @@
135136
"git",
136137
"sash"
137138
],
139+
"githubPullRequests.experimental.createView": true,
138140
"debug.javascript.terminalOptions": {
139141
"outFiles": [
140142
"${workspaceFolder}/out/**/*.js",

‎CodeQL.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,9 @@ path_classifiers:
2121
- "out-build"
2222
- "out-vscode"
2323
- "**/out/**"
24+
25+
# The default behavior is to tag library code as `library`. Results are hidden
26+
# for library code. You can tag further files as being library code by adding them
27+
# to the `library` section.
28+
library:
29+
- "**/node_modules/**"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ steps:
3030
workingDirectory: build
3131
displayName: Install pipeline build
3232
33-
- script: node build/azure-pipelines/distro/apply-cli-patches
33+
- script: node .build/distro/cli-patches/index.js
3434
displayName: Apply distro patches
3535

3636
- task: Npm@1

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

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -104,55 +104,51 @@ steps:
104104

105105
- script: |
106106
set -e
107-
TARGET=$([ "$VSCODE_ARCH" == "x64" ] && echo "linux-alpine" || echo "alpine-arm64")
107+
TARGET=$([ "$VSCODE_ARCH" == "x64" ] && echo "linux-alpine" || echo "alpine-arm64") # TODO@joaomoreno
108108
yarn gulp vscode-reh-$TARGET-min-ci
109-
yarn gulp vscode-reh-web-$TARGET-min-ci
109+
(cd .. && mv vscode-reh-$TARGET vscode-server-$TARGET) # TODO@joaomoreno
110+
ARCHIVE_PATH=".build/linux/server/vscode-server-$TARGET.tar.gz"
111+
mkdir -p $(dirname $ARCHIVE_PATH)
112+
tar --owner=0 --group=0 -czf $ARCHIVE_PATH -C .. vscode-server-$TARGET
113+
echo "##vso[task.setvariable variable=SERVER_PATH]$ARCHIVE_PATH"
110114
env:
111115
GITHUB_TOKEN: "$(github-distro-mixin-password)"
112-
displayName: Build
116+
displayName: Build server
113117
114118
- script: |
115119
set -e
116120
TARGET=$([ "$VSCODE_ARCH" == "x64" ] && echo "linux-alpine" || echo "alpine-arm64")
117-
REPO="$(pwd)"
118-
ROOT="$REPO/.."
119-
120-
# Publish Remote Extension Host
121-
LEGACY_SERVER_BUILD_NAME="vscode-reh-$TARGET"
122-
SERVER_BUILD_NAME="vscode-server-$TARGET"
123-
SERVER_TARBALL_FILENAME="vscode-server-$TARGET.tar.gz"
124-
SERVER_TARBALL_PATH="$ROOT/$SERVER_TARBALL_FILENAME"
125-
126-
rm -rf $ROOT/vscode-server-*.tar.*
127-
(cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME)
128-
129-
# Publish Remote Extension Host (Web)
130-
LEGACY_SERVER_BUILD_NAME="vscode-reh-web-$TARGET"
131-
SERVER_BUILD_NAME="vscode-server-$TARGET-web"
132-
SERVER_TARBALL_FILENAME="vscode-server-$TARGET-web.tar.gz"
133-
SERVER_TARBALL_PATH="$ROOT/$SERVER_TARBALL_FILENAME"
134-
135-
rm -rf $ROOT/vscode-server-*-web.tar.*
136-
(cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME)
137-
displayName: Prepare for publish
138-
139-
- publish: $(Agent.BuildDirectory)/vscode-server-alpine-$(VSCODE_ARCH).tar.gz
140-
artifact: vscode_server_alpine_$(VSCODE_ARCH)_archive-unsigned
121+
yarn gulp vscode-reh-web-$TARGET-min-ci
122+
(cd .. && mv vscode-reh-web-$TARGET vscode-server-$TARGET-web) # TODO@joaomoreno
123+
ARCHIVE_PATH=".build/linux/web/vscode-server-$TARGET-web.tar.gz"
124+
mkdir -p $(dirname $ARCHIVE_PATH)
125+
tar --owner=0 --group=0 -czf $ARCHIVE_PATH -C .. vscode-server-$TARGET-web
126+
echo "##vso[task.setvariable variable=WEB_PATH]$ARCHIVE_PATH"
127+
env:
128+
GITHUB_TOKEN: "$(github-distro-mixin-password)"
129+
displayName: Build server (web)
130+
131+
- script: echo "##vso[task.setvariable variable=ARTIFACT_PREFIX]attempt$(System.JobAttempt)_"
132+
condition: and(succeededOrFailed(), notIn(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues'))
133+
displayName: Generate artifact prefix
134+
135+
- publish: $(SERVER_PATH)
136+
artifact: $(ARTIFACT_PREFIX)vscode_server_alpine_$(VSCODE_ARCH)_archive-unsigned
141137
displayName: Publish server archive
142-
condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'x64'))
138+
condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''), ne(variables['VSCODE_ARCH'], 'x64'))
143139

144-
- publish: $(Agent.BuildDirectory)/vscode-server-alpine-$(VSCODE_ARCH)-web.tar.gz
145-
artifact: vscode_web_alpine_$(VSCODE_ARCH)_archive-unsigned
140+
- publish: $(WEB_PATH)
141+
artifact: $(ARTIFACT_PREFIX)vscode_web_alpine_$(VSCODE_ARCH)_archive-unsigned
146142
displayName: Publish web server archive
147-
condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'x64'))
143+
condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''), ne(variables['VSCODE_ARCH'], 'x64'))
148144

149145
# Legacy x64 artifact name
150-
- publish: $(Agent.BuildDirectory)/vscode-server-linux-alpine.tar.gz
151-
artifact: vscode_server_linux_alpine_archive-unsigned
146+
- publish: $(SERVER_PATH)
147+
artifact: $(ARTIFACT_PREFIX)vscode_server_linux_alpine_archive-unsigned
152148
displayName: Publish x64 server archive
153-
condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
149+
condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''), eq(variables['VSCODE_ARCH'], 'x64'))
154150

155-
- publish: $(Agent.BuildDirectory)/vscode-server-linux-alpine-web.tar.gz
156-
artifact: vscode_web_linux_alpine_archive-unsigned
151+
- publish: $(WEB_PATH)
152+
artifact: $(ARTIFACT_PREFIX)vscode_web_linux_alpine_archive-unsigned
157153
displayName: Publish x64 web server archive
158-
condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
154+
condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''), eq(variables['VSCODE_ARCH'], 'x64'))

0 commit comments

Comments
 (0)