From: Darren Tucker <dtucker@dtucker.net>
Date: Wed, 13 Jan 2021 07:00:57 +0000 (+1100)
Subject: Merge Mac OS X targets into a single config.
X-Git-Tag: V_8_5_P1~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8635e7df7e3a3fbb4a4f6cd5a7202883b2506087;p=thirdparty%2Fopenssh-portable.git

Merge Mac OS X targets into a single config.
---

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index f2a9538da..974404cbd 100644
--- 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