Merging upstream version 1.32.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 10 insertions, 7 deletions

diff --git a/.github/scripts/build-static-x86_64.sh b/.github/scripts/build-static.sh
index 2676b6321..e81051438 100755
--- a/.github/scripts/build-static-x86_64.sh
+++ b/.github/scripts/build-static.sh
@@ -7,9 +7,10 @@ set -e
 # shellcheck source=.github/scripts/functions.sh
 . "$(dirname "$0")/functions.sh"
 
+BUILDARCH="${1}"
 NAME="${NAME:-netdata}"
 VERSION="${VERSION:-"$(git describe)"}"
-BASENAME="$NAME-$VERSION"
+BASENAME="$NAME-$BUILDARCH-$VERSION"
 
 prepare_build() {
   progress "Preparing build"
@@ -18,10 +19,10 @@ prepare_build() {
   ) >&2
 }
 
-build_static_x86_64() {
-  progress "Building static x86_64"
+build_static() {
+  progress "Building static ${BUILDARCH}"
   (
-    USER="" ./packaging/makeself/build-x86_64-static.sh
+    USER="" ./packaging/makeself/build-static.sh "${BUILDARCH}"
   ) >&2
 }
 
@@ -31,12 +32,14 @@ prepare_assets() {
     cp packaging/version artifacts/latest-version.txt
 
     cd artifacts || exit 1
-    ln -s "${BASENAME}.gz.run" netdata-latest.gz.run
-    sha256sum -b ./* > "sha256sums.txt"
+    ln -s "${BASENAME}.gz.run" "netdata-${BUILDARCH}-latest.gz.run"
+    if [ "${BUILDARCH}" = "x86_64" ]; then
+      ln -s "${BASENAME}.gz.run" netdata-latest.gz.run
+    fi
   ) >&2
 }
 
-steps="prepare_build build_static_x86_64"
+steps="prepare_build build_static"
 steps="$steps prepare_assets"
 
 _main() {