Merging upstream version 1.35.0.

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

6 files changed, 28 insertions, 4 deletions

diff --git a/.github/scripts/build-artifacts.sh b/.github/scripts/build-artifacts.sh
index e635765bd..569c79a5a 100755
--- a/.github/scripts/build-artifacts.sh
+++ b/.github/scripts/build-artifacts.sh
@@ -33,6 +33,7 @@ build_dist() {
       --with-zlib \
       --with-math \
       --with-user=netdata \
+      --disable-dependency-tracking \
       CFLAGS=-O2
     make dist
     mv "${BASENAME}.tar.gz" artifacts/
diff --git a/.github/scripts/build-dist.sh b/.github/scripts/build-dist.sh
index f7e27324c..027b62147 100755
--- a/.github/scripts/build-dist.sh
+++ b/.github/scripts/build-dist.sh
@@ -32,6 +32,7 @@ build_dist() {
       --with-zlib \
       --with-math \
       --with-user=netdata \
+      --disable-dependency-tracking \
       CFLAGS=-O2
     make dist
     mv "${BASENAME}.tar.gz" artifacts/
diff --git a/.github/scripts/get-static-cache-key.sh b/.github/scripts/get-static-cache-key.sh
new file mode 100755
index 000000000..d9fa28597
--- /dev/null
+++ b/.github/scripts/get-static-cache-key.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+arch="${1}"
+platform="$(packaging/makeself/uname2platform.sh "${arch}")"
+
+docker pull --platform "${platform}" netdata/static-builder
+
+# shellcheck disable=SC2046
+cat $(find packaging/makeself/jobs -type f ! -regex '.*\(netdata\|-makeself\).*') > /tmp/static-cache-key-data
+
+docker run -it --rm --platform "${platform}" netdata/static-builder sh -c 'apk list -I 2>/dev/null' >> /tmp/static-cache-key-data
+
+h="$(sha256sum /tmp/static-cache-key-data | cut -f 1 -d ' ')"
+
+echo "::set-output name=key::static-${arch}-${h}"
diff --git a/.github/scripts/pkg-test.sh b/.github/scripts/pkg-test.sh
index 148ecd629..179c0c41e 100755
--- a/.github/scripts/pkg-test.sh
+++ b/.github/scripts/pkg-test.sh
@@ -7,7 +7,7 @@ install_debian_like() {
   apt-get update
 
   # Install Netdata
-  apt-get install -y /netdata/artifacts/netdata_"${VERSION}"_*.deb || exit 1
+  apt-get install -y /netdata/artifacts/netdata_"${VERSION}"*_*.deb || exit 1
 
   # Install testing tools
   apt-get install -y --no-install-recommends curl netcat jq || exit 1
@@ -36,6 +36,10 @@ install_centos() {
 
   pkg_version="$(echo "${VERSION}" | tr - .)"
 
+  if [ "${PKGMGR}" = "dnf" ]; then
+    opts="--allowerasing"
+  fi
+
   # Install EPEL (needed for `jq`
   "$PKGMGR" install -y epel-release || exit 1
 
@@ -43,7 +47,7 @@ install_centos() {
   "$PKGMGR" install -y /netdata/artifacts/netdata-"${pkg_version}"-*.rpm
 
   # Install testing tools
-  "$PKGMGR" install -y curl nc jq || exit 1
+  "$PKGMGR" install -y ${opts} curl nc jq || exit 1
 }
 
 install_suse_like() {
@@ -101,7 +105,7 @@ case "${DISTRO}" in
   fedora | oraclelinux)
     install_fedora_like
     ;;
-  centos | rockylinux)
+  centos | rockylinux | almalinux)
     install_centos
     ;;
   opensuse)
diff --git a/.github/scripts/run-updater-check.sh b/.github/scripts/run-updater-check.sh
index 264ed616a..d8961f8b4 100755
--- a/.github/scripts/run-updater-check.sh
+++ b/.github/scripts/run-updater-check.sh
@@ -2,6 +2,9 @@
 
 echo ">>> Installing Netdata..."
 /netdata/packaging/installer/kickstart.sh --dont-wait --build-only --disable-telemetry || exit 1
+echo "::group::Environment File Contents"
+cat /etc/netdata/.environment
+echo "::endgroup::"
 echo ">>> Updating Netdata..."
 export NETDATA_NIGHTLIES_BASEURL="http://localhost:8080/artifacts/" # Pull the tarball from the local web server.
 /netdata/packaging/installer/netdata-updater.sh --not-running-from-cron --no-updater-self-update || exit 1
diff --git a/.github/scripts/run_install_with_dist_file.sh b/.github/scripts/run_install_with_dist_file.sh
index 83559f267..d59e8b134 100755
--- a/.github/scripts/run_install_with_dist_file.sh
+++ b/.github/scripts/run_install_with_dist_file.sh
@@ -33,7 +33,7 @@ docker run \
   -v "${PWD}:/netdata" \
   -w /netdata \
   "ubuntu:latest" \
-  /bin/bash -c "./install-required-packages.sh --dont-wait --non-interactive netdata && apt install wget && ./netdata-installer.sh --dont-wait --require-cloud --disable-telemetry --install /tmp && echo \"Validating netdata instance is running\" && wget -O - 'http://127.0.0.1:19999/api/v1/info' | grep version"
+  /bin/bash -c "./install-required-packages.sh --dont-wait --non-interactive netdata && apt install wget && ./netdata-installer.sh --dont-wait --require-cloud --disable-telemetry --install /tmp --one-time-build && echo \"Validating netdata instance is running\" && wget -O - 'http://127.0.0.1:19999/api/v1/info' | grep version"
 popd || exit 1
 
 echo "All Done!"