Merge macos and ubuntu tests.

diff --git a/.github/configs b/.github/configs
index fa0ceff78ec841ba234a1257202d49f02ef111c1..fa8fb6a27a3337c24544a52883a671936f5c4ccf 100755 (executable)
--- a/.github/configs
+++ b/.github/configs
@@ -79,7 +79,7 @@ esac
 if [ -z "${LIBCRYPTOFLAGS}" ]; then
        # last-match
        for i in /usr/local /usr/local/ssl /usr/local/opt/openssl; do
-               if [ -d ${i}/bin/openssl ]; then
+               if [ -x ${i}/bin/openssl ]; then
                        LIBCRYPTOFLAGS="--with-ssl-dir=${i}"
                fi
        done

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index fe910bb7bc66511a6af57cc25bb6f2a7f2e71a83..36e4c14bfb44886101900b0b837fab58c65f58ca 100644 (file)
--- 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