From 083fc590df8065d035682bf212eb907a2f683073 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Tue, 13 Jun 2017 15:28:26 +0200
Subject: [PATCH] refactor tfs darwin builds

---
 build/tfs/darwin/build.sh     | 23 ++---------------------
 build/tfs/darwin/release.sh   | 26 ++++++++++++++++++++++++++
 build/tfs/darwin/smoketest.sh | 27 +++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 21 deletions(-)
 create mode 100755 build/tfs/darwin/release.sh
 create mode 100755 build/tfs/darwin/smoketest.sh

diff --git a/build/tfs/darwin/build.sh b/build/tfs/darwin/build.sh
index 1f569cf74f2..6397b310dca 100755
--- a/build/tfs/darwin/build.sh
+++ b/build/tfs/darwin/build.sh
@@ -30,24 +30,5 @@ step "Run unit tests" \
 step "Run integration tests" \
 	./scripts/test-integration.sh
 
-(cd $BUILD_SOURCESDIRECTORY/build/tfs/common && \
-	step "Install build dependencies" \
-	npm i)
-
-REPO=`pwd`
-ZIP=$REPO/../VSCode-darwin-selfsigned.zip
-UNSIGNEDZIP=$REPO/../VSCode-darwin-unsigned.zip
-BUILD=$REPO/../VSCode-darwin
-PACKAGEJSON=`ls $BUILD/*.app/Contents/Resources/app/package.json`
-VERSION=`node -p "require(\"$PACKAGEJSON\").version"`
-
-rm -rf $UNSIGNEDZIP
-(cd $BUILD && \
-	step "Create unsigned archive" \
-	zip -r -X -y $UNSIGNEDZIP *)
-
-step "Upload unsigned archive" \
-	node build/tfs/common/publish.js --upload-only $VSCODE_QUALITY darwin archive-unsigned VSCode-darwin-$VSCODE_QUALITY-unsigned.zip $VERSION false $UNSIGNEDZIP
-
-step "Sign build" \
-	node build/tfs/common/enqueue.js $VSCODE_QUALITY
\ No newline at end of file
+step "Publish release" \
+	./build/tfs/darwin/release.sh
\ No newline at end of file
diff --git a/build/tfs/darwin/release.sh b/build/tfs/darwin/release.sh
new file mode 100755
index 00000000000..24ed4c30a78
--- /dev/null
+++ b/build/tfs/darwin/release.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+. ./scripts/env.sh
+. ./build/tfs/common/common.sh
+
+(cd $BUILD_SOURCESDIRECTORY/build/tfs/common && \
+	step "Install build dependencies" \
+	npm i)
+
+REPO=`pwd`
+ZIP=$REPO/../VSCode-darwin-selfsigned.zip
+UNSIGNEDZIP=$REPO/../VSCode-darwin-unsigned.zip
+BUILD=$REPO/../VSCode-darwin
+PACKAGEJSON=`ls $BUILD/*.app/Contents/Resources/app/package.json`
+VERSION=`node -p "require(\"$PACKAGEJSON\").version"`
+
+rm -rf $UNSIGNEDZIP
+(cd $BUILD && \
+	step "Create unsigned archive" \
+	zip -r -X -y $UNSIGNEDZIP *)
+
+step "Upload unsigned archive" \
+	node build/tfs/common/publish.js --upload-only $VSCODE_QUALITY darwin archive-unsigned VSCode-darwin-$VSCODE_QUALITY-unsigned.zip $VERSION false $UNSIGNEDZIP
+
+step "Sign build" \
+	node build/tfs/common/enqueue.js $VSCODE_QUALITY
\ No newline at end of file
diff --git a/build/tfs/darwin/smoketest.sh b/build/tfs/darwin/smoketest.sh
new file mode 100755
index 00000000000..ae756d8ca35
--- /dev/null
+++ b/build/tfs/darwin/smoketest.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+. ./scripts/env.sh
+. ./build/tfs/common/common.sh
+
+export VSCODE_MIXIN_PASSWORD="$1"
+VSO_PAT="$2"
+
+echo "machine monacotools.visualstudio.com password $VSO_PAT" > ~/.netrc
+
+step "Install dependencies" \
+	npm install
+
+step "Mix in repository from vscode-distro" \
+	npm run gulp -- mixin
+
+step "Install distro dependencies" \
+	node build/tfs/common/installDistro.js
+
+step "Build minified & upload source maps" \
+	npm run gulp -- --max_old_space_size=4096 vscode-darwin-min
+
+step "Run unit tests" \
+	./scripts/test.sh --build --reporter dot
+
+step "Run integration tests" \
+	./scripts/test-integration.sh
\ No newline at end of file