Merge pull request #1703 from cdr/auto-update

Make automatic updates on v3.2.0 work again
This commit is contained in:
Anmol Sethi 2020-05-20 11:45:24 -04:00 committed by GitHub
commit 08f5760718
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 7 deletions

View File

@ -8,22 +8,30 @@ main() {
cd "$(dirname "${0}")/../.." cd "$(dirname "${0}")/../.."
source ./ci/lib.sh source ./ci/lib.sh
local release_name="code-server-$VERSION-$OS-$ARCH"
mkdir -p release-packages 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 if [[ $OS == "linux" ]]; then
tar -czf "release-packages/$release_name.tar.gz" --transform "s/^\.\/release-static/$release_name/" ./release-static tar -czf "release-packages/$release_name.tar.gz" --transform "s/^\.\/release-static/$release_name/" ./release-static
else else
tar -czf "release-packages/$release_name.tar.gz" -s "/^release-static/$release_name/" release-static tar -czf "release-packages/$release_name.tar.gz" -s "/^release-static/$release_name/" release-static
fi fi
echo "done (release-packages/$release_name)" echo "done (release-packages/$release_name)"
release_gcp release_gcp
if [[ $OSTYPE == linux* ]]; then
release_nfpm
fi
} }
release_gcp() { release_gcp() {
@ -39,7 +47,7 @@ release_nfpm() {
nfpm_config=$(envsubst < ./ci/build/nfpm.yaml) nfpm_config=$(envsubst < ./ci/build/nfpm.yaml)
# The underscores are convention for .deb. # 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" nfpm pkg -f <(echo "$nfpm_config") --target "release-packages/code-server-$VERSION-$ARCH.rpm"
} }

View File

@ -18,6 +18,9 @@ main() {
rsync ./ci/build/code-server.sh "$RELEASE_PATH/bin/code-server" rsync ./ci/build/code-server.sh "$RELEASE_PATH/bin/code-server"
rsync "$node_path" "$RELEASE_PATH/lib/node" 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" cd "$RELEASE_PATH"
yarn --production --frozen-lockfile yarn --production --frozen-lockfile
} }