From c3545b54f3330d97e06599f97c91ab73e9892f83 Mon Sep 17 00:00:00 2001
From: Doug Freed <dwfreed@mtu.edu>
Date: Sat, 16 Apr 2022 15:15:05 -0500
Subject: [PATCH] simplify github workflows using the matrix syntax

---
 .github/workflows/ci-alpine-linux.yml | 22 ++++++++--------
 .github/workflows/ci-ubuntu.yml       | 36 ++++++++-------------------
 2 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/ci-alpine-linux.yml b/.github/workflows/ci-alpine-linux.yml
index 3c5fb06d..e50c9765 100644
--- a/.github/workflows/ci-alpine-linux.yml
+++ b/.github/workflows/ci-alpine-linux.yml
@@ -4,12 +4,19 @@ on: [push, pull_request]
 
 jobs:
 
-  gcc-musl:
+  alpine:
+    name: Alpine Linux
     runs-on: ubuntu-latest
     container: alpine:latest
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+          - gcc
+    env:
+      CC: ${{ matrix.compiler }}
     steps:
-      - name: install deps
-        run: >-
+      - run: >-
           apk --no-cache add \
             build-base \
             meson \
@@ -18,14 +25,7 @@ jobs:
             linux-pam-dev \
             libcap \
             libcap-dev
-      - name: checkout
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v2
       - run: meson setup builddir/
-        env:
-          CC: gcc
       - run: meson compile -C builddir
-        env:
-          CC: gcc
       - run: meson test --verbose -C builddir
-        env:
-          CC: gcc
diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml
index 1be9f0c5..ceb36cef 100644
--- a/.github/workflows/ci-ubuntu.yml
+++ b/.github/workflows/ci-ubuntu.yml
@@ -4,35 +4,21 @@ on: [push, pull_request]
 
 jobs:
 
-  gcc-glibc:
+  ubuntu:
+    name: Ubuntu
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+          - gcc
+          - clang
+    env:
+      CC: ${{ matrix.compiler }}
     steps:
     - uses: actions/checkout@v2
     - run: sudo apt-get update -q
-    - run: sudo apt-get install -q -y build-essential libpam-dev meson libcap-dev
+    - run: sudo apt-get install -q -y build-essential libpam-dev meson libcap-dev ${CC}
     - run: meson setup builddir/
-      env:
-        CC: gcc
     - run: ninja -C builddir
-      env:
-        CC: gcc
     - run: ninja test --verbose -C builddir
-      env:
-        CC: gcc
-
-
-  clang-glibc:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - run: sudo apt-get update -q
-    - run: sudo apt-get install -q -y build-essential clang libpam-dev meson libcap-dev
-    - run: meson setup builddir/
-      env:
-        CC: clang
-    - run: ninja -C builddir
-      env:
-        CC: clang
-    - run: ninja test --verbose -C builddir
-      env:
-        CC: clang