mirror of
https://github.com/Microsoft/vscode
synced 2024-09-13 21:55:38 +00:00
update openssl-prebuild for musl failures (#175731)
* update openssl-prebuild for musl failures * reapply vendoring * reapply macos pipeline fix
This commit is contained in:
parent
f8119e9beb
commit
26fe31fc66
|
@ -13,7 +13,7 @@ steps:
|
||||||
displayName: Download openssl prebuilt
|
displayName: Download openssl prebuilt
|
||||||
inputs:
|
inputs:
|
||||||
command: custom
|
command: custom
|
||||||
customCommand: pack @vscode-internal/openssl-prebuilt@0.0.3
|
customCommand: pack @vscode-internal/openssl-prebuilt@0.0.5
|
||||||
customRegistry: useFeed
|
customRegistry: useFeed
|
||||||
customFeed: 'Monaco/openssl-prebuilt'
|
customFeed: 'Monaco/openssl-prebuilt'
|
||||||
workingDir: $(Build.ArtifactStagingDirectory)
|
workingDir: $(Build.ArtifactStagingDirectory)
|
||||||
|
@ -21,7 +21,7 @@ steps:
|
||||||
- script: |
|
- script: |
|
||||||
set -e
|
set -e
|
||||||
mkdir $(Build.ArtifactStagingDirectory)/openssl
|
mkdir $(Build.ArtifactStagingDirectory)/openssl
|
||||||
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.3.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
|
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.5.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
|
||||||
displayName: Extract openssl prebuilt
|
displayName: Extract openssl prebuilt
|
||||||
|
|
||||||
- task: NodeTool@0
|
- task: NodeTool@0
|
||||||
|
@ -53,8 +53,8 @@ steps:
|
||||||
VSCODE_CLI_TARGET: x86_64-apple-darwin
|
VSCODE_CLI_TARGET: x86_64-apple-darwin
|
||||||
VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_darwin_x64_cli
|
VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_darwin_x64_cli
|
||||||
VSCODE_CLI_ENV:
|
VSCODE_CLI_ENV:
|
||||||
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-osx/lib
|
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-osx/lib
|
||||||
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-osx/include
|
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-osx/include
|
||||||
|
|
||||||
- ${{ if eq(parameters.VSCODE_BUILD_MACOS_ARM64, true) }}:
|
- ${{ if eq(parameters.VSCODE_BUILD_MACOS_ARM64, true) }}:
|
||||||
- template: ../cli/cli-compile-and-publish.yml
|
- template: ../cli/cli-compile-and-publish.yml
|
||||||
|
@ -62,5 +62,5 @@ steps:
|
||||||
VSCODE_CLI_TARGET: aarch64-apple-darwin
|
VSCODE_CLI_TARGET: aarch64-apple-darwin
|
||||||
VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_darwin_arm64_cli
|
VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_darwin_arm64_cli
|
||||||
VSCODE_CLI_ENV:
|
VSCODE_CLI_ENV:
|
||||||
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-osx/lib
|
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-osx/lib
|
||||||
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-osx/include
|
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-osx/include
|
||||||
|
|
|
@ -22,7 +22,7 @@ steps:
|
||||||
displayName: Download openssl prebuilt
|
displayName: Download openssl prebuilt
|
||||||
inputs:
|
inputs:
|
||||||
command: custom
|
command: custom
|
||||||
customCommand: pack @vscode-internal/openssl-prebuilt@0.0.3
|
customCommand: pack @vscode-internal/openssl-prebuilt@0.0.5
|
||||||
customRegistry: useFeed
|
customRegistry: useFeed
|
||||||
customFeed: 'Monaco/openssl-prebuilt'
|
customFeed: 'Monaco/openssl-prebuilt'
|
||||||
workingDir: $(Build.ArtifactStagingDirectory)
|
workingDir: $(Build.ArtifactStagingDirectory)
|
||||||
|
@ -30,7 +30,7 @@ steps:
|
||||||
- script: |
|
- script: |
|
||||||
set -e
|
set -e
|
||||||
mkdir $(Build.ArtifactStagingDirectory)/openssl
|
mkdir $(Build.ArtifactStagingDirectory)/openssl
|
||||||
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.3.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
|
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.5.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
|
||||||
displayName: Extract openssl prebuilt
|
displayName: Extract openssl prebuilt
|
||||||
|
|
||||||
# inspired by: https://github.com/emk/rust-musl-builder/blob/main/Dockerfile
|
# inspired by: https://github.com/emk/rust-musl-builder/blob/main/Dockerfile
|
||||||
|
@ -38,7 +38,7 @@ steps:
|
||||||
- bash: |
|
- bash: |
|
||||||
set -e
|
set -e
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -yq build-essential musl-dev musl-tools linux-libc-dev pkgconf xutils-dev
|
sudo apt-get install -yq build-essential musl-dev musl-tools linux-libc-dev pkgconf xutils-dev lld
|
||||||
sudo ln -s "/usr/bin/g++" "/usr/bin/musl-g++" || echo "link exists"
|
sudo ln -s "/usr/bin/g++" "/usr/bin/musl-g++" || echo "link exists"
|
||||||
displayName: Install musl build dependencies
|
displayName: Install musl build dependencies
|
||||||
|
|
||||||
|
@ -91,9 +91,9 @@ steps:
|
||||||
VSCODE_CLI_ENV:
|
VSCODE_CLI_ENV:
|
||||||
CXX_aarch64-unknown-linux-musl: musl-g++
|
CXX_aarch64-unknown-linux-musl: musl-g++
|
||||||
CC_aarch64-unknown-linux-musl: musl-gcc
|
CC_aarch64-unknown-linux-musl: musl-gcc
|
||||||
RUSTFLAGS: "-L $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/lib"
|
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux-musl/lib
|
||||||
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/lib
|
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux-musl/include
|
||||||
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/include
|
OPENSSL_STATIC: '1'
|
||||||
|
|
||||||
- ${{ if eq(parameters.VSCODE_BUILD_ALPINE, true) }}:
|
- ${{ if eq(parameters.VSCODE_BUILD_ALPINE, true) }}:
|
||||||
- template: ../cli/cli-compile-and-publish.yml
|
- template: ../cli/cli-compile-and-publish.yml
|
||||||
|
@ -103,8 +103,9 @@ steps:
|
||||||
VSCODE_CLI_ENV:
|
VSCODE_CLI_ENV:
|
||||||
CXX_aarch64-unknown-linux-musl: musl-g++
|
CXX_aarch64-unknown-linux-musl: musl-g++
|
||||||
CC_aarch64-unknown-linux-musl: musl-gcc
|
CC_aarch64-unknown-linux-musl: musl-gcc
|
||||||
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/lib
|
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux-musl/lib
|
||||||
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/include
|
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux-musl/include
|
||||||
|
OPENSSL_STATIC: '1'
|
||||||
|
|
||||||
- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
|
- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
|
||||||
- template: ../cli/cli-compile-and-publish.yml
|
- template: ../cli/cli-compile-and-publish.yml
|
||||||
|
|
|
@ -16,14 +16,14 @@ steps:
|
||||||
displayName: Download openssl prebuilt
|
displayName: Download openssl prebuilt
|
||||||
inputs:
|
inputs:
|
||||||
command: custom
|
command: custom
|
||||||
customCommand: pack @vscode-internal/openssl-prebuilt@0.0.3
|
customCommand: pack @vscode-internal/openssl-prebuilt@0.0.5
|
||||||
customRegistry: useFeed
|
customRegistry: useFeed
|
||||||
customFeed: 'Monaco/openssl-prebuilt'
|
customFeed: 'Monaco/openssl-prebuilt'
|
||||||
workingDir: $(Build.ArtifactStagingDirectory)
|
workingDir: $(Build.ArtifactStagingDirectory)
|
||||||
|
|
||||||
- powershell: |
|
- powershell: |
|
||||||
mkdir $(Build.ArtifactStagingDirectory)/openssl
|
mkdir $(Build.ArtifactStagingDirectory)/openssl
|
||||||
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.3.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
|
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.5.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
|
||||||
displayName: Extract openssl prebuilt
|
displayName: Extract openssl prebuilt
|
||||||
|
|
||||||
- task: NodeTool@0
|
- task: NodeTool@0
|
||||||
|
|
15
cli/Cargo.lock
generated
15
cli/Cargo.lock
generated
|
@ -1333,15 +1333,6 @@ version = "0.1.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
|
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "openssl-src"
|
|
||||||
version = "111.22.0+1.1.1q"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853"
|
|
||||||
dependencies = [
|
|
||||||
"cc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "openssl-sys"
|
name = "openssl-sys"
|
||||||
version = "0.9.76"
|
version = "0.9.76"
|
||||||
|
@ -1351,7 +1342,6 @@ dependencies = [
|
||||||
"autocfg",
|
"autocfg",
|
||||||
"cc",
|
"cc",
|
||||||
"libc",
|
"libc",
|
||||||
"openssl-src",
|
|
||||||
"pkg-config",
|
"pkg-config",
|
||||||
"vcpkg",
|
"vcpkg",
|
||||||
]
|
]
|
||||||
|
@ -1908,7 +1898,7 @@ checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "secret-service"
|
name = "secret-service"
|
||||||
version = "2.0.2"
|
version = "2.0.2"
|
||||||
source = "git+https://github.com/microsoft/vscode-secret-service-rs?rev=30f0414108a122d6f2bfc28a5425d0dac9738518#30f0414108a122d6f2bfc28a5425d0dac9738518"
|
source = "git+https://github.com/microsoft/vscode-secret-service-rs?rev=fbbaf222de10546609be26bb043e64356e855edb#fbbaf222de10546609be26bb043e64356e855edb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"num",
|
"num",
|
||||||
|
@ -2377,11 +2367,12 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tunnels"
|
name = "tunnels"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/microsoft/dev-tunnels?rev=3870e9133dfb9557774521bb447827f19b26e55d#3870e9133dfb9557774521bb447827f19b26e55d"
|
source = "git+https://github.com/microsoft/dev-tunnels?rev=730aa86f8ccd9e2dd4541693fbce763357da93f4#730aa86f8ccd9e2dd4541693fbce763357da93f4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"chrono",
|
"chrono",
|
||||||
"futures",
|
"futures",
|
||||||
|
"hyper",
|
||||||
"log",
|
"log",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
"russh",
|
"russh",
|
||||||
|
|
|
@ -15,7 +15,7 @@ name = "code"
|
||||||
futures = "0.3"
|
futures = "0.3"
|
||||||
clap = { version = "3.0", features = ["derive", "env"] }
|
clap = { version = "3.0", features = ["derive", "env"] }
|
||||||
open = { version = "2.1.0" }
|
open = { version = "2.1.0" }
|
||||||
reqwest = { version = "0.11.9", default-features = false, features = ["json", "stream", "native-tls-vendored"] }
|
reqwest = { version = "0.11.9", default-features = false, features = ["json", "stream", "native-tls"] }
|
||||||
tokio = { version = "1.24.2", features = ["full"] }
|
tokio = { version = "1.24.2", features = ["full"] }
|
||||||
tokio-util = { version = "0.7", features = ["compat"] }
|
tokio-util = { version = "0.7", features = ["compat"] }
|
||||||
flate2 = { version = "1.0.22" }
|
flate2 = { version = "1.0.22" }
|
||||||
|
@ -31,12 +31,12 @@ dirs = "4.0.0"
|
||||||
rand = "0.8.5"
|
rand = "0.8.5"
|
||||||
atty = "0.2.14"
|
atty = "0.2.14"
|
||||||
opentelemetry = { version = "0.18.0", features = ["rt-tokio"] }
|
opentelemetry = { version = "0.18.0", features = ["rt-tokio"] }
|
||||||
opentelemetry-application-insights = { version = "0.22.0", features = ["reqwest-client-vendored-tls"] }
|
opentelemetry-application-insights = { version = "0.22.0", features = ["reqwest-client"] }
|
||||||
serde_bytes = "0.11.5"
|
serde_bytes = "0.11.5"
|
||||||
chrono = { version = "0.4", features = ["serde"] }
|
chrono = { version = "0.4", features = ["serde"] }
|
||||||
gethostname = "0.2.3"
|
gethostname = "0.2.3"
|
||||||
libc = "0.2"
|
libc = "0.2"
|
||||||
tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "3870e9133dfb9557774521bb447827f19b26e55d", default-features = false, features = ["connections", "vendored-openssl"] }
|
tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "730aa86f8ccd9e2dd4541693fbce763357da93f4", default-features = false, features = ["connections"] }
|
||||||
keyring = "1.1"
|
keyring = "1.1"
|
||||||
dialoguer = "0.10"
|
dialoguer = "0.10"
|
||||||
hyper = "0.14"
|
hyper = "0.14"
|
||||||
|
@ -70,7 +70,7 @@ zbus = { version = "3.4", default-features = false, features = ["tokio"] }
|
||||||
russh = { git = "https://github.com/microsoft/vscode-russh", branch = "main" }
|
russh = { git = "https://github.com/microsoft/vscode-russh", branch = "main" }
|
||||||
russh-cryptovec = { git = "https://github.com/microsoft/vscode-russh", branch = "main" }
|
russh-cryptovec = { git = "https://github.com/microsoft/vscode-russh", branch = "main" }
|
||||||
russh-keys = { git = "https://github.com/microsoft/vscode-russh", branch = "main" }
|
russh-keys = { git = "https://github.com/microsoft/vscode-russh", branch = "main" }
|
||||||
secret-service = { git = "https://github.com/microsoft/vscode-secret-service-rs", rev = "30f0414108a122d6f2bfc28a5425d0dac9738518" }
|
secret-service = { git = "https://github.com/microsoft/vscode-secret-service-rs", rev = "fbbaf222de10546609be26bb043e64356e855edb" }
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
strip = true
|
strip = true
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "code-oss-dev",
|
"name": "code-oss-dev",
|
||||||
"version": "1.77.0",
|
"version": "1.77.0",
|
||||||
"distro": "52635c8055ef02ea8f780dcd04d1fb534b1b30db",
|
"distro": "b6ce387d48144f5c7d0d33843b76e545fe561af7",
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Microsoft Corporation"
|
"name": "Microsoft Corporation"
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue