From 219a2f226226759b669c9ed8ec24006beeb2ca7b Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Mon, 1 Jul 2019 16:54:51 +0200 Subject: [PATCH] pipelines: adopt shared compilation --- .../azure-pipelines/darwin/product-build-darwin.yml | 8 ++------ build/azure-pipelines/linux/product-build-linux.yml | 13 ++----------- build/azure-pipelines/win32/product-build-win32.yml | 4 +--- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml index 74386b4ae30..cde0a7a3c2b 100644 --- a/build/azure-pipelines/darwin/product-build-darwin.yml +++ b/build/azure-pipelines/darwin/product-build-darwin.yml @@ -77,13 +77,9 @@ steps: - script: | set -e VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-darwin-min - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-reh-darwin-min - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-web-darwin-min + yarn gulp darwin-min AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \ - yarn gulp upload-vscode-sourcemaps + yarn gulp upload-vscode-sourcemaps displayName: Build - script: | diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml index bf3a0794561..f03c41a0709 100644 --- a/build/azure-pipelines/linux/product-build-linux.yml +++ b/build/azure-pipelines/linux/product-build-linux.yml @@ -77,17 +77,8 @@ steps: - script: | set -e - if [[ "$VSCODE_ARCH" == "ia32" ]]; then - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-linux-$VSCODE_ARCH-min - else - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-linux-$VSCODE_ARCH-min - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-reh-linux-$VSCODE_ARCH-min - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-web-linux-$VSCODE_ARCH-min - fi + VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + yarn gulp linux-$VSCODE_ARCH-min displayName: Build - script: | diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index adc5bd51e20..411d2f784e7 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -85,9 +85,7 @@ steps: . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" - exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-min" } - exec { yarn gulp "vscode-reh-win32-$env:VSCODE_ARCH-min" } - exec { yarn gulp "vscode-web-win32-$env:VSCODE_ARCH-min" } + exec { yarn gulp "win32-$env:VSCODE_ARCH-min" } exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-inno-updater" } displayName: Build -- GitLab