From 4582612e6147d766c336198c498740242fb8f1ec Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@dtucker.net>
Date: Wed, 17 Feb 2021 20:21:29 +1100
Subject: Merge macos and ubuntu tests.

---
 .github/workflows/c-cpp.yml | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

(limited to '.github/workflows/c-cpp.yml')

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index fe910bb7..36e4c14b 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -7,12 +7,12 @@ on:
     branches: [ master ]
 
 jobs:
-  linux:
+  ci:
     if: github.repository != 'openssh/openssh-portable-selfhosted'
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-16_04, ubuntu-18_04, ubuntu-20.04]
+        os: [ubuntu-16_04, ubuntu-18_04, ubuntu-20.04, macos-10.15, macos-11.0]
         configs: [default, pam]
         # Then we include any extra configs we want to test for specific VMs.
         include:
@@ -45,28 +45,3 @@ jobs:
       env:
         SUDO: sudo
         TEST_SSH_UNSAFE_PERMISSIONS: 1
-
-  macos:
-    if: github.repository != 'openssh/openssh-portable-selfhosted'
-    strategy:
-      matrix:
-        os: [ macos-10.15, macos-11.0 ]
-        configs: [default, pam]
-    runs-on: ${{ matrix.os }}
-    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 -j2
-    - name: copy moduli
-      run: sudo cp moduli /usr/local/etc/
-    - name: make tests
-      run: ./.github/run_test.sh ${{ matrix.configs }}
-      env:
-        SUDO: sudo
-        TEST_SSH_UNSAFE_PERMISSIONS: 1
-- 
cgit v1.2.3