Skip to content

Commit c03e6fa

Browse files
TyriarTyriar
authored
Merge branch 'main' into tyriar/161622_suggest_layout
2 parents f48fb74 + f4d9b1d commit c03e6fa

File tree

376 files changed

+7850
-5568
lines changed

Some content is hidden

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

376 files changed

+7850
-5568
lines changed

‎.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

‎.github/workflows/bad-tag.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
if: github.event.ref == '1.999.0'
99
steps:
1010
- name: Checkout Actions
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v3
1212
with:
1313
repository: "microsoft/vscode-github-triage-actions"
1414
ref: stable

‎.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
3737
- name: Cache node_modules archive
3838
id: cacheNodeModules
39-
uses: actions/cache@v2
39+
uses: actions/cache@v3
4040
with:
4141
path: ".build/node_modules_cache"
4242
key: "${{ runner.os }}-cacheNodeModulesArchive-${{ steps.nodeModulesCacheKey.outputs.value }}"
@@ -49,7 +49,7 @@ jobs:
4949
run: echo "::set-output name=dir::$(yarn cache dir)"
5050
- name: Cache yarn directory
5151
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
52-
uses: actions/cache@v2
52+
uses: actions/cache@v3
5353
with:
5454
path: ${{ steps.yarnCacheDirPath.outputs.dir }}
5555
key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -122,7 +122,7 @@ jobs:
122122
run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
123123
- name: Cache node modules
124124
id: cacheNodeModules
125-
uses: actions/cache@v2
125+
uses: actions/cache@v3
126126
with:
127127
path: "**/node_modules"
128128
key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -132,7 +132,7 @@ jobs:
132132
run: echo "::set-output name=dir::$(yarn cache dir)"
133133
- name: Cache yarn directory
134134
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
135-
uses: actions/cache@v2
135+
uses: actions/cache@v3
136136
with:
137137
path: ${{ steps.yarnCacheDirPath.outputs.dir }}
138138
key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -193,7 +193,7 @@ jobs:
193193
run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
194194
- name: Cache node modules
195195
id: cacheNodeModules
196-
uses: actions/cache@v2
196+
uses: actions/cache@v3
197197
with:
198198
path: "**/node_modules"
199199
key: ${{ runner.os }}-cacheNodeModulesMacOS-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -203,7 +203,7 @@ jobs:
203203
run: echo "::set-output name=dir::$(yarn cache dir)"
204204
- name: Cache yarn directory
205205
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
206-
uses: actions/cache@v2
206+
uses: actions/cache@v3
207207
with:
208208
path: ${{ steps.yarnCacheDirPath.outputs.dir }}
209209
key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -266,7 +266,7 @@ jobs:
266266
run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
267267
- name: Cache node modules
268268
id: cacheNodeModules
269-
uses: actions/cache@v2
269+
uses: actions/cache@v3
270270
with:
271271
path: "**/node_modules"
272272
key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -276,7 +276,7 @@ jobs:
276276
run: echo "::set-output name=dir::$(yarn cache dir)"
277277
- name: Cache yarn directory
278278
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
279-
uses: actions/cache@v2
279+
uses: actions/cache@v3
280280
with:
281281
path: ${{ steps.yarnCacheDirPath.outputs.dir }}
282282
key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}

‎.github/workflows/devcontainer-cache.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Azure CLI login
2525
id: az_login
26-
uses: azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
26+
uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2
2727
with:
2828
creds: ${{ secrets.AZ_ACR_CREDS }}
2929

‎.github/workflows/monaco-editor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
3030
- name: Cache node modules
3131
id: cacheNodeModules
32-
uses: actions/cache@v2
32+
uses: actions/cache@v3
3333
with:
3434
path: "**/node_modules"
3535
key: ${{ runner.os }}-cacheNodeModules20-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -40,7 +40,7 @@ jobs:
4040
run: echo "::set-output name=dir::$(yarn cache dir)"
4141
- name: Cache yarn directory
4242
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
43-
uses: actions/cache@v2
43+
uses: actions/cache@v3
4444
with:
4545
path: ${{ steps.yarnCacheDirPath.outputs.dir }}
4646
key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}

‎.github/workflows/pr-chat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
if: ${{ !github.event.pull_request.draft }}
1010
steps:
1111
- name: Checkout Actions
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v3
1313
with:
1414
repository: "microsoft/vscode-github-triage-actions"
1515
ref: stable

‎.github/workflows/rich-navigation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v3
1616

17-
- uses: actions/cache@v2
17+
- uses: actions/cache@v3
1818
id: caching-stage
1919
name: Cache VS Code dependencies
2020
with:

‎.vscode/settings.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@
9292
"editor.defaultFormatter": "rust-lang.rust-analyzer",
9393
"editor.formatOnSave": true,
9494
},
95+
"rust-analyzer.linkedProjects": [
96+
"cli/Cargo.toml"
97+
],
9598
"typescript.tsc.autoDetect": "off",
9699
"testing.autoRun.mode": "rerun",
97100
"conventionalCommits.scopes": [
@@ -105,5 +108,6 @@
105108
"sash"
106109
],
107110
"githubPullRequests.assignCreated": "${user}",
108-
"githubPullRequests.defaultMergeMethod": "squash"
111+
"githubPullRequests.defaultMergeMethod": "squash",
112+
"application.experimental.rendererProfiling": true
109113
}

‎build/.moduleignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ native-watchdog/build/**
4848
native-watchdog/src/**
4949
!native-watchdog/build/Release/*.node
5050

51+
node-vsce-sign/**
52+
!node-vsce-sign/src/main.js
53+
!node-vsce-sign/package.json
54+
!node-vsce-sign/bin/**
55+
5156
spdlog/binding.gyp
5257
spdlog/build/**
5358
spdlog/deps/**

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,21 @@ parameters:
88
default: {}
99

1010
steps:
11-
- script: cargo build --release --target ${{ parameters.VSCODE_CLI_TARGET }} --bin=code-tunnel
11+
- script: cargo build --release --target ${{ parameters.VSCODE_CLI_TARGET }} --bin=code
1212
displayName: Compile ${{ parameters.VSCODE_CLI_TARGET }}
1313
workingDirectory: $(Build.SourcesDirectory)/cli
1414
env:
15-
VSCODE_CLI_VERSION: $(VSCODE_CLI_VERSION)
16-
VSCODE_CLI_REMOTE_LICENSE_TEXT: $(VSCODE_CLI_REMOTE_LICENSE_TEXT)
17-
VSCODE_CLI_REMOTE_LICENSE_PROMPT: $(VSCODE_CLI_REMOTE_LICENSE_PROMPT)
18-
VSCODE_CLI_ASSET_NAME: ${{ parameters.VSCODE_CLI_ARTIFACT }}
19-
VSCODE_CLI_AI_KEY: $(VSCODE_CLI_AI_KEY)
20-
VSCODE_CLI_AI_ENDPOINT: $(VSCODE_CLI_AI_ENDPOINT)
15+
CARGO_NET_GIT_FETCH_WITH_CLI: true
2116
${{ each pair in parameters.VSCODE_CLI_ENV }}:
2217
${{ pair.key }}: ${{ pair.value }}
2318

2419
- ${{ if or(contains(parameters.VSCODE_CLI_TARGET, '-windows-'), contains(parameters.VSCODE_CLI_TARGET, '-darwin')) }}:
2520
- task: ArchiveFiles@2
2621
inputs:
2722
${{ if contains(parameters.VSCODE_CLI_TARGET, '-windows-') }}:
28-
rootFolderOrFile: $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code-tunnel.exe
23+
rootFolderOrFile: $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code.exe
2924
${{ if contains(parameters.VSCODE_CLI_TARGET, '-darwin') }}:
30-
rootFolderOrFile: $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code-tunnel
25+
rootFolderOrFile: $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code
3126
includeRootFolder: false
3227
archiveType: zip
3328
archiveFile: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.zip
@@ -39,7 +34,7 @@ steps:
3934
- ${{ else }}:
4035
- task: ArchiveFiles@2
4136
inputs:
42-
rootFolderOrFile: $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code-tunnel
37+
rootFolderOrFile: $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code
4338
includeRootFolder: false
4439
archiveType: tar
4540
tarCompression: gz

0 commit comments

Comments
 (0)