microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-10 00:27:05 -06:00
Code Issues Packages Projects Releases 177 Wiki Activity

update prepare scripts, license, lockfile

Browse Source
This commit is contained in:
Connor Peet 2022-10-17 11:35:04 -07:00
parent 75dfb8993e
commit 7c3740a7e7
No known key found for this signature in database
GPG Key ID: CF8FD2EA0DBC61BD
8 changed files with 34 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/azure-pipelines/cli/prepare.js
View File

@ -9,16 +9,28 @@ const fs = require("fs");
const path = require("path");
const packageJson = require("../../../package.json");
const root = path.dirname(path.dirname(path.dirname(__dirname)));
const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
let productJsonPath;
if (process.env.VSCODE_QUALITY === 'oss' || !process.env.VSCODE_QUALITY) {
productJsonPath = path.join(root, 'product.json');
}
else {
productJsonPath = path.join(root, 'quality', process.env.VSCODE_QUALITY, 'product.json');
}
console.log('Loading product.json from', productJsonPath);
const product = JSON.parse(fs.readFileSync(productJsonPath, 'utf8'));
const commit = (0, getVersion_1.getVersion)(root);
/**
* Sets build environment variables for the CLI for current contextual info.
*/
const setLauncherEnvironmentVars = () => {
const vars = new Map([
['VSCODE_CLI_REMOTE_LICENSE_TEXT', product.serverLicense],
['VSCODE_CLI_REMOTE_LICENSE_TEXT', product.serverLicense?.join('\\n')],
['VSCODE_CLI_REMOTE_LICENSE_PROMPT', product.serverLicensePrompt],
['VSCODE_CLI_AI_KEY', product.aiConfig?.cliKey],
['VSCODE_CLI_AI_ENDPOINT', product.aiConfig?.cliEndpoint],
['VSCODE_CLI_VERSION', packageJson.version],
['VSCODE_CLI_UPDATE_ENDPOINT', product.updateUrl],
['VSCODE_CLI_QUALITY', product.quality],
['VSCODE_CLI_COMMIT', commit],
]);
for (const [key, value] of vars) {

4
build/azure-pipelines/cli/prepare.ts
View File

@ -26,13 +26,13 @@ const commit = getVersion(root);
*/
const setLauncherEnvironmentVars = () => {
const vars = new Map([
['VSCODE_CLI_REMOTE_LICENSE_TEXT', product.serverLicense?.join('\r\n')],
['VSCODE_CLI_REMOTE_LICENSE_TEXT', product.serverLicense?.join('\\n')],
['VSCODE_CLI_REMOTE_LICENSE_PROMPT', product.serverLicensePrompt],
['VSCODE_CLI_AI_KEY', product.aiConfig?.cliKey],
['VSCODE_CLI_AI_ENDPOINT', product.aiConfig?.cliEndpoint],
['VSCODE_CLI_VERSION', packageJson.version],
['VSCODE_CLI_UPDATE_ENDPOINT', product.updateUrl],
['VSCODE_CLI_QUALIY', product.quality],
['VSCODE_CLI_QUALITY', product.quality],
['VSCODE_CLI_COMMIT', commit],
]);

3
build/azure-pipelines/darwin/cli-build-darwin.yml
View File

@ -16,7 +16,7 @@ steps:
- template: ../mixin-distro-posix.yml
parameters:
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
- script: |
set -e
@ -24,6 +24,7 @@ steps:
displayName: Prepare CLI build
env:
GITHUB_TOKEN: "$(github-distro-mixin-password)"
VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
- template: ../cli/install-rust-posix.yml
parameters:

3
build/azure-pipelines/linux/cli-build-linux.yml
View File

@ -32,7 +32,7 @@ steps:
- template: ../mixin-distro-posix.yml
parameters:
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
- script: |
set -e
@ -40,6 +40,7 @@ steps:
displayName: Prepare CLI build
env:
GITHUB_TOKEN: "$(github-distro-mixin-password)"
VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
- template: ../cli/install-rust-posix.yml
parameters:

3
build/azure-pipelines/win32/cli-build-win32.yml
View File

@ -18,7 +18,7 @@ steps:
- template: ../mixin-distro-win32.yml
parameters:
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
- powershell: |
. build/azure-pipelines/win32/exec.ps1
@ -27,6 +27,7 @@ steps:
displayName: Prepare CLI build
env:
GITHUB_TOKEN: "$(github-distro-mixin-password)"
VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
- template: ../cli/install-rust-win32.yml
parameters:

32
cglicenses.json
View File

@ -259,38 +259,6 @@
"THE SOFTWARE."
]
},
{
// Reason: The crate is old and has been deleted from GH
"name": "block-modes",
"fullLicenseText": [
"Copyright (c) 2018 The RustCrypto Project Developers",
"Copyright (c) 2018 Artyom Pavlov",
"",
"Permission is hereby granted, free of charge, to any",
"person obtaining a copy of this software and associated",
"documentation files (the \"Software\"), to deal in the",
"Software without restriction, including without",
"limitation the rights to use, copy, modify, merge,",
"publish, distribute, sublicense, and/or sell copies of",
"the Software, and to permit persons to whom the Software",
"is furnished to do so, subject to the following",
"conditions:",
"",
"The above copyright notice and this permission notice",
"shall be included in all copies or substantial portions",
"of the Software.",
"",
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
"DEALINGS IN THE SOFTWARE."
]
},
{
// Reason: repo URI is wrong on crate, pending https://github.com/warp-tech/russh/pull/53
"name": "russh-cryptovec",

112
cli/Cargo.lock generated
View File

@ -80,19 +80,6 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]]
name = "bcrypt-pbkdf"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c38c03b9506bd92bf1ef50665a81eda156f615438f7654bffba58907e6149d7"
dependencies = [
"blowfish",
"crypto-mac",
"pbkdf2",
"sha2 0.9.9",
"zeroize",
]
[[package]]
name = "bit-vec"
version = "0.6.3"
@ -105,15 +92,6 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "block-buffer"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
dependencies = [
"generic-array",
]
[[package]]
name = "block-buffer"
version = "0.10.3"
@ -132,17 +110,6 @@ dependencies = [
"generic-array",
]
[[package]]
name = "blowfish"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe3ff3fc1de48c1ac2e3341c4df38b0d1bfb8fdf04632a187c8b75aaa319a7ab"
dependencies = [
"byteorder",
"cipher",
"opaque-debug",
]
[[package]]
name = "bumpalo"
version = "3.11.0"
@ -195,15 +162,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "cipher"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
dependencies = [
"generic-array",
]
[[package]]
name = "clap"
version = "3.2.22"
@ -405,16 +363,6 @@ dependencies = [
"typenum",
]
[[package]]
name = "crypto-mac"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
dependencies = [
"generic-array",
"subtle",
]
[[package]]
name = "cxx"
version = "1.0.78"
@ -487,22 +435,13 @@ dependencies = [
"zeroize",
]
[[package]]
name = "digest"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
dependencies = [
"generic-array",
]
[[package]]
name = "digest"
version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
dependencies = [
"block-buffer 0.10.3",
"block-buffer",
"crypto-common",
"subtle",
]
@ -851,7 +790,7 @@ version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
dependencies = [
"digest 0.10.5",
"digest",
]
[[package]]
@ -1270,12 +1209,6 @@ version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
[[package]]
name = "opaque-debug"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "open"
version = "2.1.3"
@ -1475,15 +1408,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
[[package]]
name = "pbkdf2"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
dependencies = [
"crypto-mac",
]
[[package]]
name = "percent-encoding"
version = "2.2.0"
@ -1794,11 +1718,11 @@ dependencies = [
[[package]]
name = "russh"
version = "0.34.0-beta.16"
source = "git+https://github.com/microsoft/vscode-russh?branch=main#e1d29f04658b62b33391a0b14899517fd72d1f5c"
source = "git+https://github.com/microsoft/vscode-russh?branch=main#d22cf71d9ea36751322eeb9aa1e8c438a3aa1aef"
dependencies = [
"bitflags",
"byteorder",
"digest 0.10.5",
"digest",
"flate2",
"futures",
"generic-array",
@ -1812,7 +1736,7 @@ dependencies = [
"russh-cryptovec",
"russh-keys",
"sha1",
"sha2 0.10.6",
"sha2",
"subtle",
"thiserror",
"tokio",
@ -1821,7 +1745,7 @@ dependencies = [
[[package]]
name = "russh-cryptovec"
version = "0.7.0-beta.1"
source = "git+https://github.com/microsoft/vscode-russh?branch=main#e1d29f04658b62b33391a0b14899517fd72d1f5c"
source = "git+https://github.com/microsoft/vscode-russh?branch=main#d22cf71d9ea36751322eeb9aa1e8c438a3aa1aef"
dependencies = [
"libc",
"winapi",
@ -1830,9 +1754,8 @@ dependencies = [
[[package]]
name = "russh-keys"
version = "0.22.0-beta.7"
source = "git+https://github.com/microsoft/vscode-russh?branch=main#e1d29f04658b62b33391a0b14899517fd72d1f5c"
source = "git+https://github.com/microsoft/vscode-russh?branch=main#d22cf71d9ea36751322eeb9aa1e8c438a3aa1aef"
dependencies = [
"bcrypt-pbkdf",
"bit-vec",
"byteorder",
"data-encoding",
@ -1849,7 +1772,7 @@ dependencies = [
"russh-cryptovec",
"serde",
"serde_derive",
"sha2 0.10.6",
"sha2",
"thiserror",
"tokio",
"tokio-stream",
@ -2006,7 +1929,7 @@ checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
dependencies = [
"cfg-if",
"cpufeatures",
"digest 0.10.5",
"digest",
]
[[package]]
@ -2017,20 +1940,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
dependencies = [
"cfg-if",
"cpufeatures",
"digest 0.10.5",
]
[[package]]
name = "sha2"
version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
dependencies = [
"block-buffer 0.9.0",
"cfg-if",
"cpufeatures",
"digest 0.9.0",
"opaque-debug",
"digest",
]
[[package]]
@ -2041,7 +1951,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
dependencies = [
"cfg-if",
"cpufeatures",
"digest 0.10.5",
"digest",
]
[[package]]

2
cli/src/tunnels/legal.rs
View File

@ -17,7 +17,7 @@ struct PersistedConsent {
pub fn require_consent(paths: &LauncherPaths) -> Result<(), AnyError> {
match LICENSE_TEXT {
Some(t) => println!("{}", t),
Some(t) => println!("{}", t.replace("\\n", "\r\n")),
None => return Ok(()),
}