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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
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 }),
]);

// We could do this before the optimization but then it'd be copied into
Expand Down
4 changes: 3 additions & 1 deletion scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ main() {
version=$(./binaries/code-server* --version | head -1)
echo "Got '$version' for the version"
case $version in
*-vsc1.41.1) exit 0 ;;
# FIXME: this isn't semver compliant yet but its based on what our latest tag is!
*[0123456789].+[0123456789]) exit 0 ;;
*daily) echo "Assuming test builds, exiting."; exit 0 ;;
*) exit 1 ;;
esac
}
Expand Down
1 change: 1 addition & 0 deletions source/vscode-1.41.1-source
Submodule vscode-1.41.1-source added at 26076a