Merge branch 'joao/build-scripts'

build/azure-pipelines/darwin/build.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -e
+yarn gulp vscode-darwin-min
+yarn gulp upload-vscode-sourcemaps

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -36,10 +36,7 @@ steps:
     set -e
     VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" \
     AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
-    yarn gulp vscode-darwin-min
+    ./build/azure-pipelines/darwin/build.sh
-    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" \
-    AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
-    yarn gulp upload-vscode-sourcemaps
   displayName: Build
 
 - script: |
@@ -80,30 +77,10 @@ steps:
 
 - script: |
     set -e
-
-    # remove pkg from archive
-    zip -d ../VSCode-darwin.zip "*.pkg"
-
-    # publish the build
-    PACKAGEJSON=`ls ../VSCode-darwin/*.app/Contents/Resources/app/package.json`
-    VERSION=`node -p "require(\"$PACKAGEJSON\").version"`
     AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
     AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
-    node build/azure-pipelines/common/publish.js \
+    VSCODE_HOCKEYAPP_TOKEN="$(VSCODE_HOCKEYAPP_TOKEN)" \
-      "$(VSCODE_QUALITY)" \
+    ./build/azure-pipelines/darwin/publish.sh
-      darwin \
-      archive \
-      "VSCode-darwin-$(VSCODE_QUALITY).zip" \
-      $VERSION \
-      true \
-      ../VSCode-darwin.zip
-
-    # publish hockeyapp symbols
-    node build/azure-pipelines/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_MACOS)"
-
-    # upload configuration
-    AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
-    yarn gulp upload-vscode-configuration
   displayName: Publish
 
 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0

build/azure-pipelines/darwin/publish.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# remove pkg from archive
+zip -d ../VSCode-darwin.zip "*.pkg"
+
+# publish the build
+PACKAGEJSON=`ls ../VSCode-darwin/*.app/Contents/Resources/app/package.json`
+VERSION=`node -p "require(\"$PACKAGEJSON\").version"`
+node build/azure-pipelines/common/publish.js \
+	"$VSCODE_QUALITY" \
+	darwin \
+	archive \
+	"VSCode-darwin-$VSCODE_QUALITY.zip" \
+	$VERSION \
+	true \
+	../VSCode-darwin.zip
+
+# publish hockeyapp symbols
+node build/azure-pipelines/common/symbols.js "$VSCODE_MIXIN_PASSWORD" "$VSCODE_HOCKEYAPP_TOKEN" "$VSCODE_ARCH" "$VSCODE_HOCKEYAPP_ID_MACOS"
+
+# upload configuration
+yarn gulp upload-vscode-configuration

build/azure-pipelines/linux/build.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+yarn gulp "vscode-linux-$VSCODE_ARCH-min"

build/azure-pipelines/linux/product-build-linux.yml

@@ -34,11 +34,13 @@ steps:
     yarn monaco-compile-check
     node build/azure-pipelines/common/installDistro.js
     node build/lib/builtInExtensions.js
+  displayName: Prepare build
 
 - script: |
     set -e
-    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" yarn gulp vscode-linux-$(VSCODE_ARCH)-min
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" \
-  name: build
+    ./build/azure-pipelines/linux/build.sh
+  displayName: Build
 
 - script: |
     set -e
@@ -49,66 +51,16 @@ steps:
 
     DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
     # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
-  name: test
+  displayName: Run unit tests
 
 - script: |
     set -e
-    REPO="$(pwd)"
-    ROOT="$REPO/.."
-    ARCH="$(VSCODE_ARCH)"
-
-    # Publish tarball
-    PLATFORM_LINUX="linux-$(VSCODE_ARCH)"
-    [[ "$ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
-    [[ "$ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
-    BUILDNAME="VSCode-$PLATFORM_LINUX"
-    BUILD="$ROOT/$BUILDNAME"
-    BUILD_VERSION="$(date +%s)"
-    [ -z "$VSCODE_QUALITY" ] && TARBALL_FILENAME="code-$BUILD_VERSION.tar.gz" || TARBALL_FILENAME="code-$VSCODE_QUALITY-$BUILD_VERSION.tar.gz"
-    TARBALL_PATH="$ROOT/$TARBALL_FILENAME"
-    PACKAGEJSON="$BUILD/resources/app/package.json"
-    VERSION=$(node -p "require(\"$PACKAGEJSON\").version")
-
-    rm -rf $ROOT/code-*.tar.*
-    (cd $ROOT && tar -czf $TARBALL_PATH $BUILDNAME)
-
     AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
     AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
-    node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_LINUX" archive-unsigned "$TARBALL_FILENAME" "$VERSION" true "$TARBALL_PATH"
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" \
-
+    VSCODE_HOCKEYAPP_TOKEN="$(VSCODE_HOCKEYAPP_TOKEN)" \
-    # Publish hockeyapp symbols
+    ./build/azure-pipelines/linux/publish.sh
-    node build/azure-pipelines/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_LINUX64)"
+  displayName: Publish
-
-    # Publish DEB
-    yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-deb"
-    PLATFORM_DEB="linux-deb-$ARCH"
-    [[ "$ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
-    DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
-    DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
-
-    AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
-    AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
-    node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_DEB" package "$DEB_FILENAME" "$VERSION" true "$DEB_PATH"
-
-    # Publish RPM
-    yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm"
-    PLATFORM_RPM="linux-rpm-$ARCH"
-    [[ "$ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
-    RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
-    RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
-
-    AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
-    AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
-    node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_RPM" package "$RPM_FILENAME" "$VERSION" true "$RPM_PATH"
-
-    # Publish Snap
-    yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
-
-    # Pack snap tarball artifact, in order to preserve file perms
-    mkdir -p $REPO/.build/linux/snap-tarball
-    SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-$(VSCODE_ARCH).tar.gz"
-    rm -rf $SNAP_TARBALL_PATH
-    (cd .build/linux && tar -czf $SNAP_TARBALL_PATH snap)
 
 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
   displayName: 'Component Detection'

build/azure-pipelines/linux/publish.sh

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+set -e
+REPO="$(pwd)"
+ROOT="$REPO/.."
+
+# Publish tarball
+PLATFORM_LINUX="linux-$VSCODE_ARCH"
+[[ "$VSCODE_ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
+[[ "$VSCODE_ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
+BUILDNAME="VSCode-$PLATFORM_LINUX"
+BUILD="$ROOT/$BUILDNAME"
+BUILD_VERSION="$(date +%s)"
+[ -z "$VSCODE_QUALITY" ] && TARBALL_FILENAME="code-$BUILD_VERSION.tar.gz" || TARBALL_FILENAME="code-$VSCODE_QUALITY-$BUILD_VERSION.tar.gz"
+TARBALL_PATH="$ROOT/$TARBALL_FILENAME"
+PACKAGEJSON="$BUILD/resources/app/package.json"
+VERSION=$(node -p "require(\"$PACKAGEJSON\").version")
+
+rm -rf $ROOT/code-*.tar.*
+(cd $ROOT && tar -czf $TARBALL_PATH $BUILDNAME)
+
+node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_LINUX" archive-unsigned "$TARBALL_FILENAME" "$VERSION" true "$TARBALL_PATH"
+
+# Publish hockeyapp symbols
+node build/azure-pipelines/common/symbols.js "$VSCODE_MIXIN_PASSWORD" "$VSCODE_HOCKEYAPP_TOKEN" "$VSCODE_ARCH" "$VSCODE_HOCKEYAPP_ID_LINUX64"
+
+# Publish DEB
+yarn gulp "vscode-linux-$VSCODE_ARCH-build-deb"
+PLATFORM_DEB="linux-deb-$VSCODE_ARCH"
+[[ "$VSCODE_ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
+DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
+DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
+
+node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_DEB" package "$DEB_FILENAME" "$VERSION" true "$DEB_PATH"
+
+# Publish RPM
+yarn gulp "vscode-linux-$VSCODE_ARCH-build-rpm"
+PLATFORM_RPM="linux-rpm-$VSCODE_ARCH"
+[[ "$VSCODE_ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
+RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
+RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
+
+node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_RPM" package "$RPM_FILENAME" "$VERSION" true "$RPM_PATH"
+
+# Publish Snap
+yarn gulp "vscode-linux-$VSCODE_ARCH-prepare-snap"
+
+# Pack snap tarball artifact, in order to preserve file perms
+mkdir -p $REPO/.build/linux/snap-tarball
+SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-$VSCODE_ARCH.tar.gz"
+rm -rf $SNAP_TARBALL_PATH
+(cd .build/linux && tar -czf $SNAP_TARBALL_PATH snap)

build/azure-pipelines/win32/build.ps1

@@ -0,0 +1,4 @@
+. build/azure-pipelines/win32/exec.ps1
+$ErrorActionPreference = "Stop"
+exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-min" }
+exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-inno-updater" }

build/azure-pipelines/win32/product-build-win32.yml

@@ -31,14 +31,14 @@ steps:
     exec { yarn monaco-compile-check }
     exec { node build/azure-pipelines/common/installDistro.js }
     exec { node build/lib/builtInExtensions.js }
+  displayName: Prepare build
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
     $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
-    exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-min" }
+    .\build\azure-pipelines\win32\build.ps1
-    exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" }
+  displayName: Build
-  name: build
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
@@ -46,14 +46,14 @@ steps:
     exec { yarn gulp "electron-$(VSCODE_ARCH)" }
     exec { .\scripts\test.bat --build --tfs "Unit Tests" }
     # yarn smoketest -- --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
-  displayName: Unit tests
+  displayName: Run unit tests
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
     exec { yarn gulp "electron-$(VSCODE_ARCH)" }
     exec { .\scripts\test-integration.bat --build --tfs "Integration Tests" }
-  displayName: Integration tests
+  displayName: Run integration tests
 
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
   inputs:
@@ -132,31 +132,11 @@ steps:
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
-    exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-archive" "vscode-win32-$(VSCODE_ARCH)-system-setup" "vscode-win32-$(VSCODE_ARCH)-user-setup" --sign }
-
-    $Repo = "$(pwd)"
-    $Root = "$Repo\.."
-    $SystemExe = "$Repo\.build\win32-$(VSCODE_ARCH)\system-setup\VSCodeSetup.exe"
-    $UserExe = "$Repo\.build\win32-$(VSCODE_ARCH)\user-setup\VSCodeSetup.exe"
-    $Zip = "$Repo\.build\win32-$(VSCODE_ARCH)\archive\VSCode-win32-$(VSCODE_ARCH).zip"
-    $Build = "$Root\VSCode-win32-$(VSCODE_ARCH)"
-
-    # get version
-    $PackageJson = Get-Content -Raw -Path "$Build\resources\app\package.json" | ConvertFrom-Json
-    $Version = $PackageJson.version
-    $Quality = "$env:VSCODE_QUALITY"
     $env:AZURE_STORAGE_ACCESS_KEY_2 = "$(AZURE_STORAGE_ACCESS_KEY_2)"
     $env:AZURE_DOCUMENTDB_MASTERKEY = "$(AZURE_DOCUMENTDB_MASTERKEY)"
-
+    $env:VSCODE_HOCKEYAPP_TOKEN = "$(VSCODE_HOCKEYAPP_TOKEN)"
-    $assetPlatform = if ("$(VSCODE_ARCH)" -eq "ia32") { "win32" } else { "win32-x64" }
+    .\build\azure-pipelines\win32\publish.ps1
-
+  displayName: Publish
-    exec { node build/azure-pipelines/common/publish.js $Quality "$global:assetPlatform-archive" archive "VSCode-win32-$(VSCODE_ARCH)-$Version.zip" $Version true $Zip }
-    exec { node build/azure-pipelines/common/publish.js $Quality "$global:assetPlatform" setup "VSCodeSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $SystemExe }
-    exec { node build/azure-pipelines/common/publish.js $Quality "$global:assetPlatform-user" setup "VSCodeUserSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $UserExe }
-
-    # publish hockeyapp symbols
-    $hockeyAppId = if ("$(VSCODE_ARCH)" -eq "ia32") { "$(VSCODE_HOCKEYAPP_ID_WIN32)" } else { "$(VSCODE_HOCKEYAPP_ID_WIN64)" }
-    exec { node build/azure-pipelines/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" $hockeyAppId }
 
 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
   displayName: 'Component Detection'

build/azure-pipelines/win32/publish.ps1

@@ -0,0 +1,28 @@
+. build/azure-pipelines/win32/exec.ps1
+$ErrorActionPreference = "Stop"
+
+$Arch = "$env:VSCODE_ARCH"
+
+exec { yarn gulp "vscode-win32-$Arch-archive" "vscode-win32-$Arch-system-setup" "vscode-win32-$Arch-user-setup" --sign }
+
+$Repo = "$(pwd)"
+$Root = "$Repo\.."
+$SystemExe = "$Repo\.build\win32-$Arch\system-setup\VSCodeSetup.exe"
+$UserExe = "$Repo\.build\win32-$Arch\user-setup\VSCodeSetup.exe"
+$Zip = "$Repo\.build\win32-$Arch\archive\VSCode-win32-$Arch.zip"
+$Build = "$Root\VSCode-win32-$Arch"
+
+# get version
+$PackageJson = Get-Content -Raw -Path "$Build\resources\app\package.json" | ConvertFrom-Json
+$Version = $PackageJson.version
+$Quality = "$env:VSCODE_QUALITY"
+
+$AssetPlatform = if ("$Arch" -eq "ia32") { "win32" } else { "win32-x64" }
+
+exec { node build/azure-pipelines/common/publish.js $Quality "$AssetPlatform-archive" archive "VSCode-win32-$Arch-$Version.zip" $Version true $Zip }
+exec { node build/azure-pipelines/common/publish.js $Quality "$AssetPlatform" setup "VSCodeSetup-$Arch-$Version.exe" $Version true $SystemExe }
+exec { node build/azure-pipelines/common/publish.js $Quality "$AssetPlatform-user" setup "VSCodeUserSetup-$Arch-$Version.exe" $Version true $UserExe }
+
+# publish hockeyapp symbols
+$hockeyAppId = if ("$Arch" -eq "ia32") { "$env:VSCODE_HOCKEYAPP_ID_WIN32" } else { "$env:VSCODE_HOCKEYAPP_ID_WIN64" }
+exec { node build/azure-pipelines/common/symbols.js "$env:VSCODE_MIXIN_PASSWORD" "$env:VSCODE_HOCKEYAPP_TOKEN" "$Arch" $hockeyAppId }