From 105ad30a29266eafedd8ef79bc21218b92415907 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 12 Apr 2021 18:30:45 +0200
Subject: Merging upstream version 1.30.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .github/CODEOWNERS                     | 14 +++++++-------
 .github/scripts/old_package_purging.sh |  2 +-
 .github/workflows/packaging.yml        |  1 +
 .github/workflows/tests.yml            |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

(limited to '.github')

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5d0484c7e..185ececd2 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,16 +5,16 @@
 * @ktsaou @Ferroin
 
 # Ownership by directory structure
-.travis/ @Ferroin @knatsakis @kaskavel @vkalintiris
-.github/ @Ferroin @knatsakis @kaskavel @vkalintiris
+.travis/ @Ferroin @kaskavel @vkalintiris
+.github/ @Ferroin @kaskavel @vkalintiris
 aclk/ @stelfrag @underhood
 backends/ @thiagoftsm @vlvkobal
 backends/graphite/ @thiagoftsm @vlvkobal
 backends/json/ @thiagoftsm @vlvkobal
 backends/opentsdb/ @thiagoftsm @vlvkobal
 backends/prometheus/ @vlvkobal @thiagoftsm
-build/ @Ferroin @knatsakis
-contrib/debian @Ferroin @knatsakis @vkalintiris
+build/ @Ferroin
+contrib/debian @Ferroin @vkalintiris
 collectors/ @vlvkobal @mfundul
 collectors/charts.d.plugin/ @ilyam8 @Ferroin
 collectors/freebsd.plugin/ @vlvkobal @thiagoftsm
@@ -34,11 +34,11 @@ health/ @thiagoftsm @vlvkobal
 health/health.d/ @thiagoftsm @vlvkobal
 health/notifications/ @Ferroin @thiagoftsm
 libnetdata/ @thiagofsm @mfundul
-packaging/ @Ferroin @knatsakis @vkalintiris
+packaging/ @Ferroin @vkalintiris
 registry/ @jacekkolasa
 streaming/ @thiagoftsm @vlvkobal
-system/ @Ferroin @knatsakis @vkalintiris
-tests/ @Ferroin @knatsakis @kaskavel
+system/ @Ferroin @vkalintiris
+tests/ @Ferroin @kaskavel
 web/ @thiagoftsm @mfundul @vlvkobal
 web/gui/ @jacekkolasa
 
diff --git a/.github/scripts/old_package_purging.sh b/.github/scripts/old_package_purging.sh
index c90c4b780..727a1c256 100755
--- a/.github/scripts/old_package_purging.sh
+++ b/.github/scripts/old_package_purging.sh
@@ -2,7 +2,7 @@
 #
 # Script to handle package cloud retention policy
 # Our open source subscription is limited,
-# so we use this sript to control the number of packages maintained historically
+# so we use this script to control the number of packages maintained historically
 #
 # Dependencies:
 # - PACKAGE_CLOUD_RETENTION_DAYS
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index 7340c27bb..a0315430e 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -121,6 +121,7 @@ jobs:
         run: |
           echo "Packages to upload:\n$(ls artifacts/*.${{ matrix.format }})"
           for pkgfile in artifacts/*.${{ matrix.format }} ; do
+            .github/scripts/package_cloud_wrapper.sh yank ${{ env.repo }}/${{ matrix.pkgclouddistro }} ${pkgfile} || true
             .github/scripts/package_cloud_wrapper.sh push ${{ env.repo }}/${{ matrix.pkgclouddistro }} ${pkgfile}
           done
       - name: Clean
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c166c7442..171bf0bb9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -48,7 +48,7 @@ jobs:
           ./packaging/installer/install-required-packages.sh --dont-wait --non-interactive netdata-all
           sudo apt-get install -y libjson-c-dev libipmimonitoring-dev libcups2-dev libsnappy-dev \
                                   libprotobuf-dev libprotoc-dev libssl-dev protobuf-compiler \
-                                  libnetfilter-acct-dev libmongoc-dev  libcmocka-dev
+                                  libnetfilter-acct-dev libmongoc-dev  libcmocka-dev libzstd-dev
       - name: Configure
         run: |
           autoreconf -ivf
-- 
cgit v1.2.3