From 82e2b8a1698ece678f732a1d60f359997ac311ed Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Mon, 21 Oct 2019 11:16:22 -0500
Subject: [PATCH] Move source to its own directory

This matches how the rest of the build is organized but also hopefully
solves an issue where the VS Code directory is empty because we try to
cache it directly and Travis might be creating it.
---
 .gitignore       | 1 +
 .travis.yml      | 2 +-
 scripts/build.ts | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index a2fff6426..58f35a34b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ node_modules
 build
 release
 binaries
+source
diff --git a/.travis.yml b/.travis.yml
index bcf3307bf..a0ed2dc91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,4 +76,4 @@ deploy:
 cache:
   yarn: true
   directories:
-    - build/vscode-1.39.2-source
+    - source
diff --git a/scripts/build.ts b/scripts/build.ts
index 36a96f0f7..0fdff6e09 100644
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -77,11 +77,10 @@ class Builder {
 		const vscodeVersion = this.ensureArgument("vscodeVersion", args[0]);
 		const codeServerVersion = this.ensureArgument("codeServerVersion", args[1]);
 
-		const stagingPath = path.join(this.outPath, "build");
-		const vscodeSourcePath = path.join(stagingPath, `vscode-${vscodeVersion}-source`);
+		const vscodeSourcePath = path.join(this.outPath, "source", `vscode-${vscodeVersion}-source`);
 		const binariesPath = path.join(this.outPath, "binaries");
 		const binaryName = `code-server${codeServerVersion}-vsc${vscodeVersion}-${target}-${arch}`;
-		const finalBuildPath = path.join(stagingPath, `${binaryName}-built`);
+		const finalBuildPath = path.join(this.outPath, "build", `${binaryName}-built`);
 
 		switch (task) {
 			case Task.Binary: