From: Emma Foley <elfiesmelfie@users.noreply.github.com>
Date: Tue, 15 Feb 2022 14:14:15 +0000 (+0000)
Subject: [ci][gha] Miscellaneous improvements and sync with cirrus (#3976)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac581dac2478d590bdc176f6e767c837f1e9fb02;p=thirdparty%2Fcollectd.git

[ci][gha] Miscellaneous improvements and sync with cirrus (#3976)

* [ci][gha] Rename tasks

* [ci][gha] Update and use MAKEFLAGS

* [ci][gha] Remove continue-on-error from ``make distcheck`` tasks

Installation of bzip2 and make distcheck were failing on el8.
This was resolved by updating it to use CentOS Stream 8 in [1]

[1] https://github.com/collectd/ci-docker/pull/55
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f7430769f..570a8362f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
           - fedora28_x86_64
         config_flags: ['']
     env:
-      MAKEFLAGS: "-j 2"
+      MAKEFLAGS: "-j2 -sk"
       CONFIGURE_FLAGS: ${{ matrix.config_flags }}
       # this env var picked up by valgrind during make check phase
       VALGRIND_OPTS: "--errors-for-leak-kinds=definite"
@@ -48,24 +48,21 @@ jobs:
     - name: Generate configure script
       run:
         ./build.sh
-    - name: configure
+    - name: Run configure script
       run: ./configure $CONFIGURE_FLAGS
-    - name: Make
-      run: make
-    - name: make check
-      continue-on-error: true
-      run: make check
+    - name: Build collectd
+      run: make $MAKEFLAGS
+    - name: Run make check
+      run: make $MAKEFLAGS check
     - name: Dump test logs
       run: |
           cat ./test-suite.log || true
-    - name: install bzip2
-      continue-on-error: true
+    - name: Install bzip2
       run: |
         yum install -y bzip2 || apt install -y bzip2
-    - name: make
-      continue-on-error: true
+    - name: Run make distcheck
       run: |
-        make distcheck DISTCHECK_CONFIGURE_FLAGS="--disable-dependency-tracking --enable-debug"
+        make $MAKEFLAG distcheck DISTCHECK_CONFIGURE_FLAGS="--disable-dependency-tracking --enable-debug"
 
   experimental:
     runs-on: ubuntu-20.04
@@ -87,7 +84,7 @@ jobs:
             cppflags: "-fPIE -Wno-deprecated-declarations"
             config_flags: "--disable-dpdkstat --disable-dpdkevents --disable-virt --disable-xmms"
     env:
-      MAKEFLAGS: "-j 2"
+      MAKEFLAGS: "-j2 -sk"
       CFLAGS: ${{ matrix.cflags }}
       CPPFLAGS: ${{ matrix.cppflags }}
       CONFIGURE_FLAGS: ${{ matrix.config_flags }}
@@ -99,23 +96,21 @@ jobs:
     - name: Generate configure script
       run:
         ./build.sh
-    - name: configure
+    - name: Run configure script
       run: ./configure $CONFIGURE_FLAGS
-    - name: Make
-      run: make
-    - name: make check
+    - name: Build collectd
+      run: make $MAKEFLAGS
+    - name: Run make check
       # Make check is failing on a few newer distros, temporarily mark it as optional until that is resolved 
       continue-on-error: true
-      run: make check
+      run: make $MAKEFLAGS check
     - name: Dump test logs
       run: |
           cat ./test-suite.log || true
-    - name: install bzip2
-      continue-on-error: true
+    - name: Install bzip2
       run: |
         yum install -y bzip2 || apt install -y bzip2
-    - name: make distcheck
-      continue-on-error: true
+    - name: Run make distcheck
       run: |
-        make distcheck DISTCHECK_CONFIGURE_FLAGS="--disable-dependency-tracking --enable-debug"
+        make $MAKEFLAGS distcheck DISTCHECK_CONFIGURE_FLAGS="--disable-dependency-tracking --enable-debug"