From: Emma Foley <elfiesmelfie@users.noreply.github.com>
Date: Tue, 15 Feb 2022 07:46:21 +0000 (+0000)
Subject: Fix CI failures caused by unsupported distros and updates to dependencies (#3975)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51f8ec35f5f2aca918e92c8cd88f20b7346aba59;p=thirdparty%2Fcollectd.git

Fix CI failures caused by unsupported distros and updates to dependencies (#3975)

* [ci][gha] Replace trusy with Bionic and Focal

Ubuntu 14.04 (Trusty) is out of standard support [1].
``make check`` fails for test_capabilities, as noted in [2].
[3] indicates that the cause is glibc, but that updates are not expected
to the version in trusty.

This PR replaces trusty with Ubuntu 18.04 (Bionic) and 20.04 (Focal).

[1] https://wiki.ubuntu.com/Releases
[2] #3936
[3] #3927 (comment)

* [ci][cirrus] Make Valgrind error on defininte memory leaks only

Valgrind gives errors when it find possible leaks;
update the options to only error on definite leaks.

This is done using the VALGRIND_OPTS env var, which is used by valgrind
when it is invoked.

* [ci][gha] Make Valgrind error on defininte memory leaks only

Valgrind gives errors when it find possible leaks;
update the options to only error on definite leaks.

This is done using the VALGRIND_OPTS env var, which is used by valgrind
when it is invoked.
---

diff --git a/.cirrus.yml b/.cirrus.yml
index baf459de7..bde86c351 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -61,7 +61,7 @@ debian_default_toolchain_task:
   build_script:
     - make -j2 -sk
   tests_script:
-    - make -j2 -sk check
+    - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check
     - /checks/check-built-plugins.sh
 
 ###
@@ -92,7 +92,7 @@ redhat_default_toolchain_task:
   build_script:
     - make -j2 -sk
   tests_script:
-    - make -j2 -sk check
+    - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check
     - /checks/check-built-plugins.sh
 
 
@@ -124,7 +124,7 @@ non_standard_toolchains_task:
       build_script:
         - make -j2 -sk
       tests_script:
-        - make -j2 -sk check
+        - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check
 
     # build against libstatgrab, should always pass
     - env:
@@ -189,7 +189,7 @@ non_standard_toolchains_task:
       build_script:
         - make -j2 -sk
       tests_script:
-        - make -j2 -sk check
+        - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check
 
 ###
 # Build using a range of compilers, available in debian/unstable. NB: might
@@ -221,4 +221,4 @@ bleeding_edge_compilers_task:
   build_script:
     - make -j2 -sk
   tests_script:
-    - make -j2 -sk check
+    - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f544465e2..cf6d0baad 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,8 +26,10 @@ jobs:
           - buster_amd64
           - stretch_amd64
           - stretch_i386
-          - trusty_amd64
+          # Ubuntu
           - xenial_amd64
+          - bionic_amd64
+          - focal_amd64
           # RedHat family
           - el8_x86_64
           - el7_x86_64
@@ -37,6 +39,8 @@ jobs:
     env:
       MAKEFLAGS: "-j 2"
       CONFIGURE_FLAGS: ${{ matrix.config_flags }}
+      # this env var picked up by valgrind during make check phase
+      VALGRIND_OPTS: "--errors-for-leak-kinds=definite"
     steps:
     - uses: actions/checkout@v2
     - run: type pkg-config
@@ -84,6 +88,7 @@ jobs:
       CFLAGS: ${{ matrix.cflags }}
       CPPFLAGS: ${{ matrix.cppflags }}
       CONFIGURE_FLAGS: ${{ matrix.config_flags }}
+      VALGRIND_OPTS: "--errors-for-leak-kinds=definite"
     steps:
     - uses: actions/checkout@v2
     - run: type pkg-config