summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2021-07-24 13:02:51 +1000
committerDarren Tucker <dtucker@dtucker.net>2021-07-24 14:20:12 +1000
commitb6673b1d2ee90b4690ee84f634efe40225423c38 (patch)
tree2eb3e32ff4bf3ba1170cc7a8d615052deed0efda
parent9d38074b5453c1abbdf888e80828c278d3b886ac (diff)
Test OpenBSD upstream with and without OpenSSL.
-rw-r--r--.github/workflows/upstream.yml8
1 files changed, 5 insertions, 3 deletions
diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml
index 71b11463..3d0bdd32 100644
--- 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