Skip to content

Commit 53d8230

Browse files
committed
Make automatic updates on v3.2.0 work again
Only for linux amd64 users which is the majority of our userbase.
1 parent 2064e88 commit 53d8230

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

ci/build/build-packages.sh

+16-8
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,32 @@ main() {
88
cd "$(dirname "${0}")/../.."
99
source ./ci/lib.sh
1010

11-
local release_name="code-server-$VERSION-$OS-$ARCH"
1211
mkdir -p release-packages
1312

14-
if [[ $OS == "linux" ]]; then
15-
tar -czf "release-packages/$release_name.tar.gz" --transform "s/^\.\/release-static/$release_name/" ./release-static
16-
else
17-
tar -czf "release-packages/$release_name.tar.gz" -s "/^release-static/$release_name/" release-static
13+
release_archive
14+
if [[ $OS == linux && $ARCH == "amd64" ]]; then
15+
# Will stop most of the auto update issues.
16+
# For the other releases it's more important to not pollute the release listing.
17+
ARCH=x86_64 release_archive
1818
fi
1919

20-
echo "done (release-packages/$release_name)"
21-
2220
release_gcp
2321

2422
if [[ $OSTYPE == linux* ]]; then
2523
release_nfpm
2624
fi
2725
}
2826

27+
release_archive() {
28+
local release_name="code-server-$VERSION-$OS-$ARCH"
29+
if [[ $OS == "linux" ]]; then
30+
tar -czf "release-packages/$release_name.tar.gz" --transform "s/^\.\/release-static/$release_name/" ./release-static
31+
else
32+
tar -czf "release-packages/$release_name.tar.gz" -s "/^release-static/$release_name/" release-static
33+
fi
34+
echo "done (release-packages/$release_name)"
35+
}
36+
2937
release_gcp() {
3038
mkdir -p "release-gcp/$VERSION"
3139
cp "release-packages/$release_name.tar.gz" "./release-gcp/$VERSION/$OS-$ARCH.tar.gz"
@@ -39,7 +47,7 @@ release_nfpm() {
3947
nfpm_config=$(envsubst < ./ci/build/nfpm.yaml)
4048

4149
# The underscores are convention for .deb.
42-
nfpm pkg -f <(echo "$nfpm_config") --target "release-packages/code-server_${VERSION}_${ARCH}.deb"
50+
nfpm pkg -f <(echo "$nfpm_config") --target "release-packages/code-server_${VERSION}_$ARCH.deb"
4351
nfpm pkg -f <(echo "$nfpm_config") --target "release-packages/code-server-$VERSION-$ARCH.rpm"
4452
}
4553

ci/build/build-static-release.sh

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ main() {
1818
rsync ./ci/build/code-server.sh "$RELEASE_PATH/bin/code-server"
1919
rsync "$node_path" "$RELEASE_PATH/lib/node"
2020

21+
ln -s "./bin/code-server" "$RELEASE_PATH/code-server"
22+
ln -s "./lib/node" "$RELEASE_PATH/node"
23+
2124
cd "$RELEASE_PATH"
2225
yarn --production --frozen-lockfile
2326
}

0 commit comments

Comments
 (0)