Merge Mac OS X targets into a single config.

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index f2a9538da55e65903b1e586b75b053a1fa89be92..974404cbda3d8fad33f2d3fc1d9cc4908122fa2f 100644 (file)
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -95,42 +95,14 @@ jobs:
         TEST_SSH_UNSAFE_PERMISSIONS: 1
 
 
-  macos-10_15:
-
-    runs-on: macos-10.15
-
+  macos:
     strategy:
       matrix:
+        os: [ macos-10.15, macos-11.0 ]
         configs:
         - ""
         - "--with-pam"
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: setup CI system
-      run: ./.github/setup_ci.sh ${{ matrix.configs }}
-    - name: autoreconf
-      run: autoreconf
-    - name: configure
-      run: ./configure --with-ssl-dir=/usr/local/opt/openssl ${{ matrix.configs }}
-    - name: make
-      run: make
-    - name: make tests
-      run: ./.github/run_test.sh ${{ matrix.configs }}
-      env:
-        SUDO: sudo
-        TEST_SSH_UNSAFE_PERMISSIONS: 1
-
-  macos-11_0:
-
-    runs-on: macos-11.0
-
-    strategy:
-      matrix:
-        configs:
-        - ""
-        - "--with-pam"
-
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
     - name: setup CI system