Skip to content

scripts/build: ditch -vsc suffix #1310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

scripts/build: ditch -vsc suffix #1310

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5fc2908
scripts/build: ditch -vsc suffix
Jan 28, 2020
f0b9ad5
scripts/build: add dash seperator
Jan 28, 2020
9c096a8
scripts/build: remove redundant key
Jan 29, 2020
13f2d00
scripts/test: use shell pattern matching for version check
Jan 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class Builder {

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 binaryName = `code-server-${codeServerVersion}-${target}-${arch}`;
const finalBuildPath = path.join(this.outPath, "build", `${binaryName}-built`);

switch (task) {
Expand Down Expand Up @@ -231,7 +231,7 @@ class Builder {

const [productJson, packageJson] = await Promise.all([
merge("product", { commit, date }),
merge("package", { codeServerVersion: `${codeServerVersion}-vsc${vscodeVersion}` }),
merge("package", { codeServerVersion: codeServerVersion }),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a big deal but this could be { codeServerVersion }.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch

]);

// We could do this before the optimization but then it'd be copied into
Expand Down
1 change: 1 addition & 0 deletions source/vscode-1.41.1-source
Open in desktop
Submodule vscode-1.41.1-source added at 26076a