diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2021-09-06 09:10:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-06 09:10:05 -0400 |
| commit | 214cb3a41e86bc11c825b9ed8ff2513d4e69c72d (patch) | |
| tree | 0dafc60c9701d2681bfdb45160c8271d3ca33a85 /.github/scripts | |
| parent | 86bec920ef41913a0670c6f1be526c79bdbb8bf1 (diff) | |
Embed build architecture in static build archive names. (#11463)
* Embed build architecture in static build archive names.
This is required for proper support for static installs in the new
kickstart script.
The associated changes will also simplify adding static builds for other
architectures in the future.
* Update CI to use new static build changes properly.
* Fix typos.
* Fix link created by static build process.
* Fix build environment setup.
Diffstat (limited to '.github/scripts')
| -rwxr-xr-x | .github/scripts/build-static.sh (renamed from .github/scripts/build-static-x86_64.sh) | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.github/scripts/build-static-x86_64.sh b/.github/scripts/build-static.sh index 2676b6321a..5448fcea5f 100755 --- a/.github/scripts/build-static-x86_64.sh +++ b/.github/scripts/build-static.sh @@ -7,6 +7,7 @@ set -e # shellcheck source=.github/scripts/functions.sh . "$(dirname "$0")/functions.sh" +BUILDARCH="${1}" NAME="${NAME:-netdata}" VERSION="${VERSION:-"$(git describe)"}" BASENAME="$NAME-$VERSION" @@ -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 } @@ -36,7 +37,7 @@ prepare_assets() { ) >&2 } -steps="prepare_build build_static_x86_64" +steps="prepare_build build_static" steps="$steps prepare_assets" _main() { |