From c3692c96f6617733d3020b45f04227196b1ff08d Mon Sep 17 00:00:00 2001 From: Connor Peet Date: Fri, 21 Oct 2022 10:17:22 -0700 Subject: [PATCH] build: use npm instead of universal for arm compatibility --- .../darwin/cli-build-darwin.yml | 20 ++++++++++++------- .../azure-pipelines/linux/cli-build-linux.yml | 20 ++++++++++++------- .../azure-pipelines/win32/cli-build-win32.yml | 19 +++++++++++------- 3 files changed, 38 insertions(+), 21 deletions(-) diff --git a/build/azure-pipelines/darwin/cli-build-darwin.yml b/build/azure-pipelines/darwin/cli-build-darwin.yml index b7acc5f381b..db71867fb0d 100644 --- a/build/azure-pipelines/darwin/cli-build-darwin.yml +++ b/build/azure-pipelines/darwin/cli-build-darwin.yml @@ -10,14 +10,20 @@ parameters: default: stable steps: - - task: UniversalPackages@0 + - task: Npm@1 + displayName: Download openssl prebuilt inputs: - command: download - downloadDirectory: $(Build.ArtifactStagingDirectory)/openssl - feedsToUse: internal - vstsFeed: 'Monaco/openssl-prebuilt' - vstsFeedPackage: openssl - vstsPackageVersion: 0.0.1 + command: custom + customCommand: pack @vscode-internal/openssl-prebuilt@0.0.1 + customRegistry: useFeed + customFeed: 'Monaco/openssl-prebuilt' + workingDir: $(Build.ArtifactStagingDirectory) + + - script: | + set -e + mkdir $(Build.ArtifactStagingDirectory)/openssl + tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.1.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl + displayName: Extract openssl prebuilt - task: NodeTool@0 inputs: diff --git a/build/azure-pipelines/linux/cli-build-linux.yml b/build/azure-pipelines/linux/cli-build-linux.yml index 4644acba06c..4fbbd790485 100644 --- a/build/azure-pipelines/linux/cli-build-linux.yml +++ b/build/azure-pipelines/linux/cli-build-linux.yml @@ -21,14 +21,20 @@ parameters: default: stable steps: - - task: UniversalPackages@0 + - task: Npm@1 + displayName: Download openssl prebuilt inputs: - command: download - downloadDirectory: $(Build.ArtifactStagingDirectory)/openssl - feedsToUse: internal - vstsFeed: 'Monaco/openssl-prebuilt' - vstsFeedPackage: openssl - vstsPackageVersion: 0.0.1 + command: custom + customCommand: pack @vscode-internal/openssl-prebuilt@0.0.1 + customRegistry: useFeed + customFeed: 'Monaco/openssl-prebuilt' + workingDir: $(Build.ArtifactStagingDirectory) + + - script: | + set -e + mkdir $(Build.ArtifactStagingDirectory)/openssl + tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.1.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl + displayName: Extract openssl prebuilt # inspired by: https://github.com/emk/rust-musl-builder/blob/main/Dockerfile - bash: | diff --git a/build/azure-pipelines/win32/cli-build-win32.yml b/build/azure-pipelines/win32/cli-build-win32.yml index ddd50dcf859..87b05d57a5b 100644 --- a/build/azure-pipelines/win32/cli-build-win32.yml +++ b/build/azure-pipelines/win32/cli-build-win32.yml @@ -12,14 +12,19 @@ parameters: default: stable steps: - - task: UniversalPackages@0 + - task: Npm@1 + displayName: Download openssl prebuilt inputs: - command: download - downloadDirectory: $(Build.ArtifactStagingDirectory)/openssl - feedsToUse: internal - vstsFeed: 'Monaco/openssl-prebuilt' - vstsFeedPackage: openssl - vstsPackageVersion: 0.0.1 + command: custom + customCommand: pack @vscode-internal/openssl-prebuilt@0.0.1 + customRegistry: useFeed + customFeed: 'Monaco/openssl-prebuilt' + workingDir: $(Build.ArtifactStagingDirectory) + + - powershell: | + mkdir $(Build.ArtifactStagingDirectory)/openssl + tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.1.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl + displayName: Extract openssl prebuilt - task: NodeTool@0 inputs: