diff options
author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2021-10-28 13:12:44 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-28 13:12:44 -0400 |
commit | 7eb25b2ff51bc7c40a4886c23ac97fb295f242cf (patch) | |
tree | f4e43a855ef12d45cdcbd041d6a8c85df773f01a /packaging/makeself/jobs | |
parent | c7a16dc75c4af1e05a6eab3d92c10fe9f4c49a48 (diff) |
Add log grouping in installer and static build code when running under GitHub Actions. (#11720)
* Add log grouping in installer code when running under GitHub Actions.
This will make our CI logs much easier to understand.
* Add log grouping to static build process.
* Use oneliner style group commands in netdata-installer.sh
Diffstat (limited to 'packaging/makeself/jobs')
8 files changed, 32 insertions, 0 deletions
diff --git a/packaging/makeself/jobs/10-prepare-destination.install.sh b/packaging/makeself/jobs/10-prepare-destination.install.sh index 8cce2d4427..98d89c723f 100755 --- a/packaging/makeself/jobs/10-prepare-destination.install.sh +++ b/packaging/makeself/jobs/10-prepare-destination.install.sh @@ -4,6 +4,8 @@ # shellcheck source=packaging/makeself/functions.sh . "$(dirname "${0}")/../functions.sh" "${@}" || exit 1 +[ -n "${GITHUB_ACTIONS}" ] && echo "::group::Preparing build environment" + [ -d "${NETDATA_INSTALL_PATH}.old" ] && run rm -rf "${NETDATA_INSTALL_PATH}.old" [ -d "${NETDATA_INSTALL_PATH}" ] && run mv -f "${NETDATA_INSTALL_PATH}" "${NETDATA_INSTALL_PATH}.old" @@ -15,3 +17,5 @@ run cd "${NETDATA_INSTALL_PATH}/usr" run ln -s ../bin bin run ln -s ../sbin sbin run ln -s . local + +[ -n "${GITHUB_ACTIONS}" ] && echo "::endgroup::" diff --git a/packaging/makeself/jobs/20-openssl.install.sh b/packaging/makeself/jobs/20-openssl.install.sh index 174f25208a..21f6dee445 100755 --- a/packaging/makeself/jobs/20-openssl.install.sh +++ b/packaging/makeself/jobs/20-openssl.install.sh @@ -4,6 +4,8 @@ # shellcheck source=packaging/makeself/functions.sh . "$(dirname "${0}")/../functions.sh" "${@}" || exit 1 +[ -n "${GITHUB_ACTIONS}" ] && echo "::group::Building OpenSSL" + version="$(cat "$(dirname "${0}")/../openssl.version")" export CFLAGS='-fno-lto' @@ -19,3 +21,5 @@ cd "${NETDATA_MAKESELF_PATH}/tmp/openssl" || exit 1 run ./config -static no-tests --prefix=/openssl-static --openssldir=/opt/netdata/etc/ssl run make -j "$(nproc)" run make -j "$(nproc)" install_sw + +[ -n "${GITHUB_ACTIONS}" ] && echo "::endgroup::" diff --git a/packaging/makeself/jobs/50-bash-5.1.8.install.sh b/packaging/makeself/jobs/50-bash-5.1.8.install.sh index 5d4f0f40ae..cf47275432 100755 --- a/packaging/makeself/jobs/50-bash-5.1.8.install.sh +++ b/packaging/makeself/jobs/50-bash-5.1.8.install.sh @@ -4,6 +4,8 @@ # shellcheck source=packaging/makeself/functions.sh . "$(dirname "${0}")/../functions.sh" "${@}" || exit 1 +[ -n "${GITHUB_ACTIONS}" ] && echo "::group::building bash" + fetch "bash-5.1.8" "http://ftp.gnu.org/gnu/bash/bash-5.1.8.tar.gz" export PKG_CONFIG_PATH="/openssl-static/lib/pkgconfig" @@ -32,3 +34,5 @@ run make install if [ ${NETDATA_BUILD_WITH_DEBUG} -eq 0 ]; then run strip "${NETDATA_INSTALL_PATH}"/bin/bash fi + +[ -n "${GITHUB_ACTIONS}" ] && echo "::endgroup::" diff --git a/packaging/makeself/jobs/50-curl-7.78.0.install.sh b/packaging/makeself/jobs/50-curl-7.78.0.install.sh index 640871646d..d83c65419a 100755 --- a/packaging/makeself/jobs/50-curl-7.78.0.install.sh +++ b/packaging/makeself/jobs/50-curl-7.78.0.install.sh @@ -4,6 +4,8 @@ # shellcheck source=packaging/makeself/functions.sh . "$(dirname "${0}")/../functions.sh" "${@}" || exit 1 +[ -n "${GITHUB_ACTIONS}" ] && echo "::group::Building cURL" + fetch "curl-7.78.0" "https://curl.haxx.se/download/curl-7.78.0.tar.gz" export CFLAGS="-I/openssl-static/include" @@ -45,3 +47,5 @@ run make install if [ ${NETDATA_BUILD_WITH_DEBUG} -eq 0 ]; then run strip "${NETDATA_INSTALL_PATH}"/bin/curl fi + +[ -n "${GITHUB_ACTIONS}" ] && echo "::group::Preparing build environment" diff --git a/packaging/makeself/jobs/50-fping-5.0.install.sh b/packaging/makeself/jobs/50-fping-5.0.install.sh index e62c47e451..64c71d5646 100755 --- a/packaging/makeself/jobs/50-fping-5.0.install.sh +++ b/packaging/makeself/jobs/50-fping-5.0.install.sh @@ -4,6 +4,8 @@ # shellcheck source=packaging/makeself/functions.sh . "$(dirname "${0}")/../functions.sh" "${@}" || exit 1 +[ -n "${GITHUB_ACTIONS}" ] && echo "::group::Building fping" + fetch "fping-5.0" "https://fping.org/dist/fping-5.0.tar.gz" export CFLAGS="-static -I/openssl-static/include" @@ -28,3 +30,5 @@ run make install if [ ${NETDATA_BUILD_WITH_DEBUG} -eq 0 ]; then run strip "${NETDATA_INSTALL_PATH}"/bin/fping fi + +[ -n "${GITHUB_ACTIONS}" ] && echo "::endgroup::" diff --git a/packaging/makeself/jobs/50-ioping-1.2.install.sh b/packaging/makeself/jobs/50-ioping-1.2.install.sh index 22f26914a6..67df88a0b5 100755 --- a/packaging/makeself/jobs/50-ioping-1.2.install.sh +++ b/packaging/makeself/jobs/50-ioping-1.2.install.sh @@ -4,6 +4,8 @@ # shellcheck source=packaging/makeself/functions.sh . "$(dirname "${0}")/../functions.sh" "${@}" || exit 1 +[ -n "${GITHUB_ACTIONS}" ] && echo "::group::Building ioping" + fetch "ioping-1.2" "https://github.com/koct9i/ioping/archive/v1.2.tar.gz" export CFLAGS="-static" @@ -16,3 +18,5 @@ run install -o root -g root -m 4750 ioping "${NETDATA_INSTALL_PATH}"/usr/libexec if [ ${NETDATA_BUILD_WITH_DEBUG} -eq 0 ]; then run strip "${NETDATA_INSTALL_PATH}"/usr/libexec/netdata/plugins.d/ioping fi + +[ -n "${GITHUB_ACTIONS}" ] && echo "::endgroup::" diff --git a/packaging/makeself/jobs/70-netdata-git.install.sh b/packaging/makeself/jobs/70-netdata-git.install.sh index ffb90dd2ec..2f7bb84227 100755 --- a/packaging/makeself/jobs/70-netdata-git.install.sh +++ b/packaging/makeself/jobs/70-netdata-git.install.sh @@ -34,6 +34,8 @@ run ./netdata-installer.sh \ --use-system-protobuf \ --dont-scrub-cflags-even-though-it-may-break-things +[ -n "${GITHUB_ACTIONS}" ] && echo "::group::Finishing netdata install" + # Properly mark the install type cat > "${NETDATA_INSTALL_PATH}/etc/netdata/.install-type" <<-EOF INSTALL_TYPE='manual-static' @@ -55,3 +57,5 @@ if [ ${NETDATA_BUILD_WITH_DEBUG} -eq 0 ]; then run strip "${NETDATA_INSTALL_PATH}"/usr/libexec/netdata/plugins.d/apps.plugin run strip "${NETDATA_INSTALL_PATH}"/usr/libexec/netdata/plugins.d/cgroup-network fi + +[ -n "${GITHUB_ACTIONS}" ] && echo "::endgroup::" diff --git a/packaging/makeself/jobs/99-makeself.install.sh b/packaging/makeself/jobs/99-makeself.install.sh index dbac65c16c..30ef75874c 100755 --- a/packaging/makeself/jobs/99-makeself.install.sh +++ b/packaging/makeself/jobs/99-makeself.install.sh @@ -4,6 +4,8 @@ # shellcheck source=packaging/makeself/functions.sh . "$(dirname "${0}")/../functions.sh" "${@}" || exit 1 +[ -n "${GITHUB_ACTIONS}" ] && echo "::group::Building self-extracting archive" + run cd "${NETDATA_SOURCE_PATH}" || exit 1 # ----------------------------------------------------------------------------- @@ -105,4 +107,6 @@ if [ "${BUILDARCH}" = "x86_64" ]; then run ln -s "./${FILE}" "artifacts/netdata-${VERSION}.gz.run" fi +[ -n "${GITHUB_ACTIONS}" ] && echo "::endgroup::" + echo >&2 "Self-extracting installer moved to 'artifacts/${FILE}'" |