[openssh-commits] [openssh] branch master updated: Set build options in /etc/mk.conf once at startup.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

The following commit(s) were added to refs/heads/master by this push:
     new 5dac5a925 Set build options in /etc/mk.conf once at startup.
5dac5a925 is described below

commit 5dac5a9252074fb39da617ffc123830266614a4c
Author: Darren Tucker <dtucker at dtucker.net>
AuthorDate: Wed Jun 24 12:19:53 2026 +1000

    Set build options in /etc/mk.conf once at startup.
---
 .github/workflows/upstream.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml
index 74a0bc8ba..8a105ce68 100644
--- a/.github/workflows/upstream.yml
+++ b/.github/workflows/upstream.yml
@@ -45,16 +45,24 @@ jobs:
       working-directory: ${{ runner.temp }}
     - name: update source
       run: vmrun "cd /usr/src && if [ -d .git ]; then git pull && git log -n1; else cvs -q up -dPA usr.bin/ssh regress/usr.bin/ssh usr.bin/nc; fi"
+    - name: set build options in /etc/mk.conf
+      run: |
+        case ${{ matrix.config }} in \
+          without-openssl) o='OPENSSL=no' ;; \
+          kerberos5) o='KERBEROS5=yes' ;; \
+          ubsan) o='DEBUG=-fsanitize-minimal-runtime -fsanitize=undefined';; \
+        esac
+        vmrun "echo $o | sudo tee -a /etc/mk.conf"
     - name: update netcat
       run: vmrun "cd /usr/src/usr.bin/nc && make clean all && sudo make install"
     - name: make clean
-      run: vmrun "cd /usr/src/usr.bin/ssh && make obj && make clean && cd /usr/src/regress/usr.bin/ssh && make obj && make clean && sudo chmod -R g-w /usr/src /usr/obj"
+      run: vmrun "make -C /usr/src/usr.bin/ssh obj clean && make -C /usr/src/regress/usr.bin/ssh obj clean && sudo chmod -R g-w /usr/src /usr/obj"
     - name: make
-      run: vmrun "cd /usr/src/usr.bin/ssh && case ${{ matrix.config }} in without-openssl) make OPENSSL=no;; kerberos5) make KERBEROS5=yes;; ubsan) make DEBUG='-fsanitize-minimal-runtime -fsanitize=undefined';; *) make; esac"
+      run: vmrun " make -C /usr/src/usr.bin/ssh"
     - name: make install
-      run: vmrun "cd /usr/src/usr.bin/ssh && sudo make install && sudo /etc/rc.d/sshd -f restart"
+      run: vmrun "sudo make -C /usr/src/usr.bin/ssh install && sudo /etc/rc.d/sshd -f restart"
     - name: make tests`
-      run: vmrun "cd /usr/src/regress/usr.bin/ssh && case ${{ matrix.config }} in without-openssl) make OPENSSL=no;; ubsan) make DEBUG='-fsanitize-minimal-runtime -fsanitize=undefined';; *) make; esac"
+      run: vmrun "cd /usr/src/regress/usr.bin/ssh && case ${{ matrix.config }} in without-openssl) make OPENSSL=no;; *) make;; esac"
       env:
         SUDO: sudo
       timeout-minutes: 300

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.