summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2021-07-26 04:45:30 +0200
committerDarren Tucker <dtucker@dtucker.net>2021-07-26 04:45:30 +0200
commita1f78e08bdb3eaa88603ba3c6e01de7c8671e28a (patch)
tree8f88489ed3e1f999a56b2a87258245a46412f433 /.github
parentSet SUDO for tests and cleanup. (diff)
downloadopenssh-a1f78e08bdb3eaa88603ba3c6e01de7c8671e28a.tar.xz
openssh-a1f78e08bdb3eaa88603ba3c6e01de7c8671e28a.zip
Move SUDO to "make test" command line.
Environment variables don't get passed by vmrun, so move to command line.
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/upstream.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml
index fb7208286..5004aa830 100644
--- a/.github/workflows/upstream.yml
+++ b/.github/workflows/upstream.yml
@@ -10,7 +10,6 @@ jobs:
runs-on: ${{ matrix.os }}
env:
TARGET_HOST: ${{ matrix.os }}
- SUDO: sudo
strategy:
fail-fast: false
matrix:
@@ -31,7 +30,7 @@ jobs:
- name: make install
run: vmrun "cd /usr/src/usr.bin/ssh && sudo make install"
- name: make tests
- run: vmrun "cd /usr/src/regress/usr.bin/ssh && make obj && make clean && if test '${{ matrix.configs }}' = 'without-openssl'; then make OPENSSL=no; else make; fi"
+ run: vmrun "cd /usr/src/regress/usr.bin/ssh && make obj && make clean && if test '${{ matrix.configs }}' = 'without-openssl'; then make SUDO=sudo OPENSSL=no; else make SUDO=sudo; fi"
- name: save logs
if: failure()
uses: actions/upload-artifact@v2