From 3ddf242c65806209685cab8ba0881fd7116e094f Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 20 May 2020 09:38:01 -0400 Subject: [PATCH] Make automatic updates on v3.2.0 work again Only for linux amd64 users which is the majority of our userbase. --- ci/build/build-packages.sh | 22 +++++++++++++++------- ci/build/build-static-release.sh | 3 +++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ci/build/build-packages.sh b/ci/build/build-packages.sh index 95b0e0ae..f8590184 100755 --- a/ci/build/build-packages.sh +++ b/ci/build/build-packages.sh @@ -8,22 +8,30 @@ main() { cd "$(dirname "${0}")/../.." source ./ci/lib.sh - local release_name="code-server-$VERSION-$OS-$ARCH" mkdir -p release-packages + release_archive + if [[ $OS == linux && $ARCH == "amd64" ]]; then + # Will stop most of the auto update issues. + # For the other releases it's more important to not pollute the release listing. + ARCH=x86_64 release_archive + fi + + if [[ $OSTYPE == linux* ]]; then + release_nfpm + fi +} + +release_archive() { + local release_name="code-server-$VERSION-$OS-$ARCH" if [[ $OS == "linux" ]]; then tar -czf "release-packages/$release_name.tar.gz" --transform "s/^\.\/release-static/$release_name/" ./release-static else tar -czf "release-packages/$release_name.tar.gz" -s "/^release-static/$release_name/" release-static fi - echo "done (release-packages/$release_name)" release_gcp - - if [[ $OSTYPE == linux* ]]; then - release_nfpm - fi } release_gcp() { @@ -39,7 +47,7 @@ release_nfpm() { nfpm_config=$(envsubst < ./ci/build/nfpm.yaml) # The underscores are convention for .deb. - nfpm pkg -f <(echo "$nfpm_config") --target "release-packages/code-server_${VERSION}_${ARCH}.deb" + nfpm pkg -f <(echo "$nfpm_config") --target "release-packages/code-server_${VERSION}_$ARCH.deb" nfpm pkg -f <(echo "$nfpm_config") --target "release-packages/code-server-$VERSION-$ARCH.rpm" } diff --git a/ci/build/build-static-release.sh b/ci/build/build-static-release.sh index 69075579..68ce544d 100755 --- a/ci/build/build-static-release.sh +++ b/ci/build/build-static-release.sh @@ -18,6 +18,9 @@ main() { rsync ./ci/build/code-server.sh "$RELEASE_PATH/bin/code-server" rsync "$node_path" "$RELEASE_PATH/lib/node" + ln -s "./bin/code-server" "$RELEASE_PATH/code-server" + ln -s "./lib/node" "$RELEASE_PATH/node" + cd "$RELEASE_PATH" yarn --production --frozen-lockfile }