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.
This commit is contained in:
Asher 2019-10-21 11:16:22 -05:00
parent 5aa2abaf9f
commit 82e2b8a169
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
3 changed files with 4 additions and 4 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ node_modules
build build
release release
binaries binaries
source

View File

@ -76,4 +76,4 @@ deploy:
cache: cache:
yarn: true yarn: true
directories: directories:
- build/vscode-1.39.2-source - source

View File

@ -77,11 +77,10 @@ class Builder {
const vscodeVersion = this.ensureArgument("vscodeVersion", args[0]); const vscodeVersion = this.ensureArgument("vscodeVersion", args[0]);
const codeServerVersion = this.ensureArgument("codeServerVersion", args[1]); const codeServerVersion = this.ensureArgument("codeServerVersion", args[1]);
const stagingPath = path.join(this.outPath, "build"); const vscodeSourcePath = path.join(this.outPath, "source", `vscode-${vscodeVersion}-source`);
const vscodeSourcePath = path.join(stagingPath, `vscode-${vscodeVersion}-source`);
const binariesPath = path.join(this.outPath, "binaries"); const binariesPath = path.join(this.outPath, "binaries");
const binaryName = `code-server${codeServerVersion}-vsc${vscodeVersion}-${target}-${arch}`; 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) { switch (task) {
case Task.Binary: case Task.Binary: