Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 0788e94

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

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed

‎ci/build/arch-override.json‎

Lines changed: 8 additions & 0 deletions
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‎

Lines changed: 16 additions & 3 deletions
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}" ./ci/build/arch-override.json > /dev/null; then
48+
jq -re ".${PKG_FORMAT}.${ARCH}" ./ci/build/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‎

Lines changed: 1 addition & 1 deletion
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)

AltStyle によって変換されたページ (->オリジナル) /