diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2021-01-13 18:00:57 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-01-13 18:00:57 +1100 |
| commit | 8635e7df7e3a3fbb4a4f6cd5a7202883b2506087 (patch) | |
| tree | 24865456699b04126bfc33d88d8c678cf8657cb2 | |
| parent | ac112ade990585c511048ed4edaf2d9fc92b61f0 (diff) | |
Merge Mac OS X targets into a single config.
| -rw-r--r-- | .github/workflows/c-cpp.yml | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index f2a9538d..974404cb 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 |