Test OpenBSD upstream with and without OpenSSL.

diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml
index 71b114631503b798939e7e2121bdefab82c5c79d..3d0bdd32ea984c18f85f4be9ed1017a1adbb3cfa 100644 (file)
--- a/.github/workflows/upstream.yml
+++ b/.github/workflows/upstream.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ obsdsnap, obsdsnap-i386 ]
-        configs: [ default ]
+        configs: [ default, without-openssl ]
     steps:
     - uses: actions/checkout@v2
     - name: shutdown VM if running
@@ -23,8 +23,10 @@ jobs:
       run: vmstartup
     - name: update source
       run: vmrun "cd /usr/src && cvs up -dPA usr.bin/ssh regress/usr.bin/ssh"
+    - name: make clean
+      run: vmrun "cd /usr/src/usr.bin/ssh && make obj && make clean"
     - name: make
-      run: vmrun "cd /usr/src/usr.bin/ssh && make obj && make clean && make"
+      run: vmrun "cd /usr/src/usr.bin/ssh && if test '${{ matrix.configs }}' = 'without-openssl'; then make OPENSSL=no; else make; fi"
     - name: make install
       run: vmrun "cd /usr/src/usr.bin/ssh && sudo make install"
     - name: make tests
@@ -33,7 +35,7 @@ jobs:
       if: failure()
       uses: actions/upload-artifact@v2
       with:
-        name: ${{ matrix.os }}-logs
+        name: ${{ matrix.os }}-${{ matrix.configs }}-logs
         path: |
           /usr/obj/regress/usr.bin/ssh/*.log
     - name: shutdown VM