Skip to content

Commit 06466f4

Browse files
author
Akash Satheesan
committed
fix(ci): adjust armv7 architectures
1 parent 820ff03 commit 06466f4

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed

ci/build/arch-override.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"rpm": {
3+
"armv7l": "armhfp"
4+
},
5+
"deb": {
6+
"armv7l": "armhf"
7+
}
8+
}

ci/build/build-packages.sh

+16-3
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,27 @@ release_gcp() {
4343
cp "./release-packages/$release_name.tar.gz" "./release-gcp/latest/$OS-$ARCH.tar.gz"
4444
}
4545

46+
get_nfpm_arch() {
47+
if jq -re .${PKG_FORMAT}.${ARCH} arch-override.json > /dev/null; then
48+
jq -re .${PKG_FORMAT}.${ARCH} arch-override.json
49+
else
50+
echo $ARCH
51+
fi
52+
}
53+
4654
# Generates deb and rpm packages.
4755
release_nfpm() {
4856
local nfpm_config
57+
58+
PKG_FORMAT="deb"
59+
NFPM_ARCH="$(get_nfpm_arch)"
4960
nfpm_config="$(envsubst < ./ci/build/nfpm.yaml)"
61+
nfpm pkg -f <(echo "$nfpm_config") --target "release-packages/code-server_${VERSION}_${NFPM_ARCH}.deb"
5062

51-
# The underscores are convention for .deb.
52-
nfpm pkg -f <(echo "$nfpm_config") --target "release-packages/code-server_${VERSION}_$ARCH.deb"
53-
nfpm pkg -f <(echo "$nfpm_config") --target "release-packages/code-server-$VERSION-$ARCH.rpm"
63+
PKG_FORMAT="rpm"
64+
NFPM_ARCH="$(get_nfpm_arch)"
65+
nfpm_config="$(envsubst < ./ci/build/nfpm.yaml)"
66+
nfpm pkg -f <(echo "$nfpm_config") --target "release-packages/code-server-$VERSION-$NFPM_ARCH.rpm"
5467
}
5568

5669
main "$@"

ci/build/nfpm.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: "code-server"
2-
arch: "${ARCH}"
2+
arch: "${NFPM_ARCH}"
33
platform: "linux"
44
version: "v${VERSION}"
55
section: "devel"

0 commit comments

Comments
 (0)