Skip to content

Commit 82e2b8a

Browse files
committed
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.
1 parent 5aa2aba commit 82e2b8a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ node_modules
22
build
33
release
44
binaries
5+
source

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,4 @@ deploy:
7676
cache:
7777
yarn: true
7878
directories:
79-
- build/vscode-1.39.2-source
79+
- source

scripts/build.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,10 @@ class Builder {
7777
const vscodeVersion = this.ensureArgument("vscodeVersion", args[0]);
7878
const codeServerVersion = this.ensureArgument("codeServerVersion", args[1]);
7979

80-
const stagingPath = path.join(this.outPath, "build");
81-
const vscodeSourcePath = path.join(stagingPath, `vscode-${vscodeVersion}-source`);
80+
const vscodeSourcePath = path.join(this.outPath, "source", `vscode-${vscodeVersion}-source`);
8281
const binariesPath = path.join(this.outPath, "binaries");
8382
const binaryName = `code-server${codeServerVersion}-vsc${vscodeVersion}-${target}-${arch}`;
84-
const finalBuildPath = path.join(stagingPath, `${binaryName}-built`);
83+
const finalBuildPath = path.join(this.outPath, "build", `${binaryName}-built`);
8584

8685
switch (task) {
8786
case Task.Binary:

0 commit comments

Comments
 (0)