From 5fc2908f9e04a43ef1d85af225c950097d5d4410 Mon Sep 17 00:00:00 2001 From: Ayane Satomi Date: Tue, 28 Jan 2020 22:00:16 +0800 Subject: [PATCH 1/4] scripts/build: ditch -vsc suffix This would fix some automation systems since keeping the vsc suffix with our new tag deployment system breaks some of the CIs most people use. --- scripts/build.ts | 4 ++-- source/vscode-1.41.1-source | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 160000 source/vscode-1.41.1-source diff --git a/scripts/build.ts b/scripts/build.ts index 945c9b22ef6c..f0c78ad122bc 100644 --- a/scripts/build.ts +++ b/scripts/build.ts @@ -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) { @@ -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 }), ]); // We could do this before the optimization but then it'd be copied into diff --git a/source/vscode-1.41.1-source b/source/vscode-1.41.1-source new file mode 160000 index 000000000000..26076a4de974 --- /dev/null +++ b/source/vscode-1.41.1-source @@ -0,0 +1 @@ +Subproject commit 26076a4de974ead31f97692a0d32f90d735645c0 From f0b9ad5ace67d106d579a407e65eef3092863e8b Mon Sep 17 00:00:00 2001 From: Ayane Satomi Date: Tue, 28 Jan 2020 23:23:13 +0800 Subject: [PATCH 2/4] scripts/build: add dash seperator This is to add some sort of seperation between the version and the name of the binary. --- scripts/build.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.ts b/scripts/build.ts index f0c78ad122bc..b1f390307e19 100644 --- a/scripts/build.ts +++ b/scripts/build.ts @@ -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}-${target}-${arch}`; + const binaryName = `code-server-${codeServerVersion}-${target}-${arch}`; const finalBuildPath = path.join(this.outPath, "build", `${binaryName}-built`); switch (task) { From 9c096a858a735e5f199c7c4c950722990fe12b8d Mon Sep 17 00:00:00 2001 From: Ayane Satomi Date: Wed, 29 Jan 2020 22:35:42 +0800 Subject: [PATCH 3/4] scripts/build: remove redundant key Signed-off-by: Ayane Satomi --- scripts/build.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.ts b/scripts/build.ts index b1f390307e19..b8f963613843 100644 --- a/scripts/build.ts +++ b/scripts/build.ts @@ -231,7 +231,7 @@ class Builder { const [productJson, packageJson] = await Promise.all([ merge("product", { commit, date }), - merge("package", { codeServerVersion: codeServerVersion }), + merge("package", { codeServerVersion }), ]); // We could do this before the optimization but then it'd be copied into From 13f2d007a5d409a9cf12dea07f3a4da0d3fcc7b5 Mon Sep 17 00:00:00 2001 From: Ayane Satomi Date: Wed, 29 Jan 2020 22:55:20 +0800 Subject: [PATCH 4/4] scripts/test: use shell pattern matching for version check also added a sanity check for daily version print Signed-off-by: Ayane Satomi --- scripts/test.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/test.sh b/scripts/test.sh index b8496130a9fa..e06488d20f3c 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -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 }