From c336644351fa3c715a08b7a292e309e72792e71e Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@dtucker.net>
Date: Fri, 8 Jan 2021 14:26:32 +1100
Subject: [PATCH] Add Ubuntu 16.04 and 20.04 test targets.

---
 .github/setup_ci.sh         |  7 +++++
 .github/workflows/c-cpp.yml | 56 +++++++++++++++++++++++++++++++++++--
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh
index e2474ccd7..61349be11 100755
--- a/.github/setup_ci.sh
+++ b/.github/setup_ci.sh
@@ -1,5 +1,12 @@
 #!/usr/bin/env bash
 
+case $(./config.guess) in
+*-darwin*)
+	# no setup needed for Mac OS X
+	exit 0
+	;;
+esac
+
 TARGETS=$@
 
 PACKAGES=""
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 2189756bb..83fd02ba2 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -7,9 +7,35 @@ on:
     branches: [ master ]
 
 jobs:
-  build:
+  ubuntu-20_04:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
+
+    strategy:
+      matrix:
+        configs:
+        - ""
+        - "--with-kerberos5 --with-libedit --with-pam --with-security-key-builtin --with-selinux"
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: setup CI system
+      run: ./.github/setup_ci.sh ${{ matrix.configs }}
+    - name: autoreconf
+      run: autoreconf
+    - name: configure
+      run: ./configure ${{ matrix.configs }}
+    - name: make
+      run: make
+    - name: make tests
+      run: ./.github/run_test.sh ${{ matrix.configs }}
+      env:
+        TEST_SSH_UNSAFE_PERMISSIONS: 1
+
+
+  ubuntu-18_04:
+
+    runs-on: ubuntu-18.04
 
     strategy:
       matrix:
@@ -37,3 +63,29 @@ jobs:
       run: ./.github/run_test.sh ${{ matrix.configs }}
       env:
         TEST_SSH_UNSAFE_PERMISSIONS: 1
+
+
+  ubuntu-16_04:
+
+    runs-on: ubuntu-16.04
+
+    strategy:
+      matrix:
+        configs:
+        - ""
+        - "--with-pam --with-selinux --with-libedit --with-kerberos5 "
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: setup CI system
+      run: ./.github/setup_ci.sh ${{ matrix.configs }}
+    - name: autoreconf
+      run: autoreconf
+    - name: configure
+      run: ./configure ${{ matrix.configs }}
+    - name: make
+      run: make
+    - name: make tests
+      run: ./.github/run_test.sh ${{ matrix.configs }}
+      env:
+        TEST_SSH_UNSAFE_PERMISSIONS: 1