diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2021-02-17 20:21:29 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-02-17 20:46:03 +1100 |
| commit | 4582612e6147d766c336198c498740242fb8f1ec (patch) | |
| tree | 29b2c4147f3055a50bbef6404954abcc8d00446b | |
| parent | 09f4b84654b71099559492e9aed5e1a38bf24815 (diff) | |
Merge macos and ubuntu tests.
| -rwxr-xr-x | .github/configs | 2 | ||||
| -rw-r--r-- | .github/workflows/c-cpp.yml | 29 |
2 files changed, 3 insertions, 28 deletions
diff --git a/.github/configs b/.github/configs index fa0ceff7..fa8fb6a2 100755 --- 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 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 |