From: Darren Tucker <dtucker@dtucker.net>
Date: Mon, 26 Jul 2021 02:45:30 +0000 (+1000)
Subject: Move SUDO to "make test" command line.
X-Git-Tag: V_8_7_P1~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1f78e08bdb3eaa88603ba3c6e01de7c8671e28a;p=thirdparty%2Fopenssh-portable.git

Move SUDO to "make test" command line.

Environment variables don't get passed by vmrun, so move to command
line.
---

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