Skip to content

Commit ed605a6

Browse files
michaelforneymichaelforney
committed
Merge tag 'V_10_0_P2'
openssh-10.0p2 (identical to 10.0p1)
2 parents 1c380d2 + 2593769 commit ed605a6

133 files changed

Lines changed: 10052 additions & 6450 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.depend‎

Lines changed: 8 additions & 11 deletions
Large diffs are not rendered by default.

‎.git_allowed_signers‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
dtucker@dtucker.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKecyjh9aNmD4rb8WblA8v91JjRb0Cd2JtkzqxcggGeG
1+
dtucker@dtucker.net valid-before="20241206" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKecyjh9aNmD4rb8WblA8v91JjRb0Cd2JtkzqxcggGeG
22
dtucker@dtucker.net sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBDV81zWQ1+XVfWH5z4L4klDQ/z/6l2GLphfSTX/Rmq6kL5H8mkfzUlryxLlkN8cD9srtVJBAmwJWfJBNsCo958YAAAAEc3NoOg==
3+
dtucker@dtucker.net sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIElSYahCw60CGct39Eg9EY8OLV9Ppr7tsudvSiMyNHOhAAAABHNzaDo=
34

45
djm@mindrot.org sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBLnJo3ZVDENYZGXm5uO9lU7b0iDFq5gHpTu1MaHPWTEfPdvw+AjFQQ/q5YizuMJkXGsMdYmblJEJZYHpm9IS7ZkAAAAEc3NoOg==
56
djm@mindrot.org sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBJoAXBTQalfg+kC5wy1vE7HkIHtVnmV6AUuuIo9KQ1P+70juHwvsFKpsGaqQbrHJkTVgYDGVP02XHj8+Fb18yBIAAAAEc3NoOg==
67
djm@mindrot.org sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBH+z1I48s6ydOhP5SJmI02zVCLf0K15B+UMHgoTIKVfUIv5oDoVX7e9f+7QiRmTeEOdZfQydiaVqsfi7qPSve+0AAAAEc3NoOg==
78
djm@mindrot.org sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBPM4BmUg/fMnsl42JwktTekk/mB8Be3M+yK2ayg6lqYsqEri8yhRx84gey51OHKVk1TwlGbJjcMHI4URreDBEMQAAAAEc3NoOg==
9+
10+
tim@multitalents.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC/L8E1DfiZ9cHzygqx0IzRCSAlmh4tXH7mZPwWZEY1L
11+

‎.github/ci-status.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,11 @@ master :
99
9.9 :
1010
[![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg?branch=V_9_9)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:V_9_9)
1111
[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg?branch=V_9_9)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:V_9_9)
12+
13+
9.8 :
14+
[![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg?branch=V_9_8)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:V_9_8)
15+
[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg?branch=V_9_8)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:V_9_8)
16+
17+
9.7 :
18+
[![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg?branch=V_9_7)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:V_9_7)
19+
[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg?branch=V_9_7)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:V_9_7)

‎.github/configs‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,21 @@ case "$config" in
129129
kitchensink)
130130
CONFIGFLAGS="--with-kerberos5 --with-libedit --with-pam"
131131
CONFIGFLAGS="${CONFIGFLAGS} --with-security-key-builtin --with-selinux"
132+
CONFIGFLAGS="${CONFIGFLAGS} --with-linux-memlock-onfault"
132133
CFLAGS="-DSK_DEBUG -DSANDBOX_SECCOMP_FILTER_DEBUG"
133134
;;
134135
hardenedmalloc)
135136
CONFIGFLAGS="--with-ldflags=-lhardened_malloc"
136137
;;
137138
tcmalloc)
138139
CONFIGFLAGS="--with-ldflags=-ltcmalloc"
140+
# tcmalloc may, depending on the stacktrace generator it uses, create
141+
# pipe(2) fds during shared library initialisation. These will later
142+
# get clobbered by ssh/sshd calling closefrom() and chaos will ensue.
143+
# Tell tcmalloc to use an unwinder that doesn't pull this stuff.
144+
TCMALLOC_STACKTRACE_METHOD=generic_fp
145+
TEST_SSH_SSHD_ENV="TCMALLOC_STACKTRACE_METHOD=generic_fp"
146+
export TCMALLOC_STACKTRACE_METHOD TEST_SSH_SSHD_ENV
139147
;;
140148
krb5|heimdal)
141149
CONFIGFLAGS="--with-kerberos5"
@@ -166,7 +174,7 @@ case "$config" in
166174
CONFIGFLAGS="--with-selinux"
167175
;;
168176
sk)
169-
CONFIGFLAGS="--with-security-key-builtin"
177+
CONFIGFLAGS="--with-security-key-builtin --with-security-key-standalone"
170178
;;
171179
without-bearssl)
172180
LIBCRYPTOFLAGS="--without-bearssl"
@@ -250,6 +258,10 @@ case "${TARGET_HOST}" in
250258
# Native linker is not great with PIC so OpenSSL is built w/out.
251259
CONFIGFLAGS="${CONFIGFLAGS} --disable-security-key"
252260
;;
261+
fbsd14-ppc64)
262+
# Disable security key tests for bigendian interop test.
263+
CONFIGFLAGS="${CONFIGFLAGS} --disable-security-key"
264+
;;
253265
hurd)
254266
SKIP_LTESTS="forwarding multiplex proxy-connect hostkey-agent agent-ptrace"
255267
;;
@@ -280,8 +292,20 @@ case "${TARGET_HOST}" in
280292
# SHA256 functions in sha2.h conflict with OpenSSL's breaking sk-dummy
281293
CONFIGFLAGS="${CONFIGFLAGS} --without-hardening --disable-security-key"
282294
;;
295+
openwrt-mipsel)
296+
# Test most of the flags that OpenWRT sets for their package build.
297+
# We only do this on one OpenWRT target for better coverage.
298+
# The installed shared libraries installed by default are stripped and
299+
# can't be linked to on the target systems.
300+
OPENWRT_FLAGS="--disable-strip --disable-lastlog
301+
--disable-utmp --disable-utmpx --disable-wtmp --disable-wtmpx
302+
--with-stackprotect --with-cflags-after=-fzero-call-used-regs=skip"
303+
CONFIGFLAGS="${CONFIGFLAGS} $(echo ${OPENWRT_FLAGS}) --without-zlib --disable-security-key"
304+
LIBCRYPTOFLAGS="--without-openssl"
305+
TEST_TARGET="t-exec"
306+
;;
283307
openwrt-*)
284-
CONFIGFLAGS="${CONFIGFLAGS} --without-zlib"
308+
CONFIGFLAGS="${CONFIGFLAGS} --without-zlib --disable-security-key"
285309
LIBCRYPTOFLAGS="--without-bearssl"
286310
TEST_TARGET="t-exec"
287311
;;

‎.github/run_test.sh‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,31 @@ output_failed_logs() {
3333
}
3434
trap output_failed_logs 0
3535

36+
env=""
37+
if [ ! -z "${SUDO}" ]; then
38+
env="${env} SUDO=${SUDO}"
39+
fi
40+
if [ ! -z "${TCMALLOC_STACKTRACE_METHOD}" ]; then
41+
env="${env} TCMALLOC_STACKTRACE_METHOD=${TCMALLOC_STACKTRACE_METHOD}"
42+
fi
43+
if [ ! -z "${TEST_SSH_SSHD_ENV}" ]; then
44+
env="${env} TEST_SSH_SSHD_ENV=${TEST_SSH_SSHD_ENV}"
45+
fi
46+
if [ ! -z "${env}" ]; then
47+
env="env${env}"
48+
fi
49+
3650
if [ -z "${LTESTS}" ]; then
37-
make ${TEST_TARGET} SKIP_LTESTS="${SKIP_LTESTS}"
51+
${env} make ${TEST_TARGET} SKIP_LTESTS="${SKIP_LTESTS}"
3852
else
39-
make ${TEST_TARGET} SKIP_LTESTS="${SKIP_LTESTS}" LTESTS="${LTESTS}"
53+
${env} make ${TEST_TARGET} SKIP_LTESTS="${SKIP_LTESTS}" LTESTS="${LTESTS}"
4054
fi
4155

4256
if [ ! -z "${SSHD_CONFOPTS}" ]; then
4357
echo "rerunning t-exec with TEST_SSH_SSHD_CONFOPTS='${SSHD_CONFOPTS}'"
4458
if [ -z "${LTESTS}" ]; then
45-
make t-exec SKIP_LTESTS="${SKIP_LTESTS}" TEST_SSH_SSHD_CONFOPTS="${SSHD_CONFOPTS}"
59+
${env} make t-exec SKIP_LTESTS="${SKIP_LTESTS}" TEST_SSH_SSHD_CONFOPTS="${SSHD_CONFOPTS}"
4660
else
47-
make t-exec SKIP_LTESTS="${SKIP_LTESTS}" LTESTS="${LTESTS}" TEST_SSH_SSHD_CONFOPTS="${SSHD_CONFOPTS}"
61+
${env} make t-exec SKIP_LTESTS="${SKIP_LTESTS}" LTESTS="${LTESTS}" TEST_SSH_SSHD_CONFOPTS="${SSHD_CONFOPTS}"
4862
fi
4963
fi

‎.github/setup_ci.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,15 @@ if [ ! -z "${INSTALL_LIBFIDO2}" ]; then
201201
make -j2 && sudo make install)
202202
fi
203203

204+
if [ ! -z "${INSTALL_AWSLC}" ]; then
205+
(cd ${HOME} && git clone --depth 1 --branch v1.46.1 https://github.com/aws/aws-lc.git &&
206+
cd ${HOME}/aws-lc && mkdir build && cd build &&
207+
cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF .. && ninja &&
208+
mkdir -p /opt/aws-lc/lib &&
209+
cp ${HOME}/aws-lc/build/crypto/libcrypto.a /opt/aws-lc/lib &&
210+
cp -r ${HOME}/aws-lc/include /opt/aws-lc)
211+
fi
212+
204213
if [ ! -z "${INSTALL_ZLIB}" ]; then
205214
(cd ${HOME} && git clone https://github.com/madler/zlib.git &&
206215
cd ${HOME}/zlib && ./configure && make &&

‎.github/workflows/c-cpp.yml‎

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: C/C++ CI
22

33
on:
44
push:
5-
paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac', '.github/configs', '.github/workflows/c-cpp.yaml' ]
5+
paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac', '.github/configs', '.github/workflows/c-cpp.yml' ]
66
pull_request:
7-
paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac', '.github/configs', '.github/workflows/c-cpp.yaml' ]
7+
paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac', '.github/configs', '.github/workflows/c-cpp.yml' ]
88

99
jobs:
1010
ci:
@@ -15,11 +15,13 @@ jobs:
1515
matrix:
1616
# First we test all OSes in the default configuration.
1717
target:
18-
- ubuntu-20.04
1918
- ubuntu-22.04
20-
- macos-12
19+
- ubuntu-latest
20+
- ubuntu-22.04-arm
21+
- ubuntu-24.04-arm
2122
- macos-13
2223
- macos-14
24+
- macos-15
2325
- windows-2019
2426
- windows-2022
2527
config: [default]
@@ -28,32 +30,34 @@ jobs:
2830
include:
2931
- { target: windows-2019, config: cygwin-release }
3032
- { target: windows-2022, config: cygwin-release }
31-
- { target: ubuntu-20.04, config: valgrind-1 }
32-
- { target: ubuntu-20.04, config: valgrind-2 }
33-
- { target: ubuntu-20.04, config: valgrind-3 }
34-
- { target: ubuntu-20.04, config: valgrind-4 }
35-
- { target: ubuntu-20.04, config: valgrind-unit }
36-
- { target: ubuntu-20.04, config: c89 }
37-
- { target: ubuntu-20.04, config: clang-6.0 }
38-
- { target: ubuntu-20.04, config: clang-8 }
39-
- { target: ubuntu-20.04, config: clang-9 }
40-
- { target: ubuntu-20.04, config: clang-10 }
41-
- { target: ubuntu-20.04, config: clang-11 }
42-
- { target: ubuntu-20.04, config: clang-12-Werror }
43-
- { target: ubuntu-20.04, config: clang-sanitize-address }
44-
- { target: ubuntu-20.04, config: clang-sanitize-undefined }
45-
- { target: ubuntu-20.04, config: gcc-sanitize-address }
46-
- { target: ubuntu-20.04, config: gcc-sanitize-undefined }
47-
- { target: ubuntu-20.04, config: gcc-7 }
48-
- { target: ubuntu-20.04, config: gcc-8 }
49-
- { target: ubuntu-20.04, config: gcc-10 }
33+
- { target: ubuntu-22.04, config: c89 }
34+
- { target: ubuntu-22.04, config: clang-11 }
35+
- { target: ubuntu-22.04, config: clang-12-Werror }
36+
- { target: ubuntu-22.04, config: clang-14 }
37+
- { target: ubuntu-22.04, config: clang-sanitize-address }
38+
- { target: ubuntu-22.04, config: clang-sanitize-undefined }
39+
- { target: ubuntu-22.04, config: gcc-9 }
5040
- { target: ubuntu-22.04, config: gcc-11-Werror }
5141
- { target: ubuntu-22.04, config: gcc-12-Werror }
52-
- { target: ubuntu-20.04, config: pam }
53-
- { target: ubuntu-20.04, config: kitchensink }
42+
- { target: ubuntu-22.04, config: gcc-sanitize-address }
43+
- { target: ubuntu-22.04, config: gcc-sanitize-undefined }
5444
- { target: ubuntu-22.04, config: hardenedmalloc }
55-
- { target: ubuntu-20.04, config: tcmalloc }
56-
- { target: ubuntu-20.04, config: musl }
45+
- { target: ubuntu-22.04, config: heimdal }
46+
- { target: ubuntu-22.04, config: kitchensink }
47+
- { target: ubuntu-22.04, config: krb5 }
48+
- { target: ubuntu-22.04, config: libedit }
49+
- { target: ubuntu-22.04, config: pam }
50+
- { target: ubuntu-22.04, config: selinux }
51+
- { target: ubuntu-22.04, config: sk }
52+
- { target: ubuntu-22.04, config: valgrind-1 }
53+
- { target: ubuntu-22.04, config: valgrind-2 }
54+
- { target: ubuntu-22.04, config: valgrind-3 }
55+
- { target: ubuntu-22.04, config: valgrind-4 }
56+
- { target: ubuntu-22.04, config: valgrind-unit }
57+
- { target: ubuntu-22.04, config: without-bearssl }
58+
- { target: ubuntu-latest, config: gcc-14 }
59+
- { target: ubuntu-latest, config: clang-15 }
60+
- { target: ubuntu-latest, config: clang-19 }
5761
- { target: ubuntu-latest, config: bearssl-head }
5862
- { target: ubuntu-latest, config: putty-0.71 }
5963
- { target: ubuntu-latest, config: putty-0.72 }
@@ -65,19 +69,18 @@ jobs:
6569
- { target: ubuntu-latest, config: putty-0.78 }
6670
- { target: ubuntu-latest, config: putty-0.79 }
6771
- { target: ubuntu-latest, config: putty-0.80 }
72+
- { target: ubuntu-latest, config: putty-0.81 }
73+
- { target: ubuntu-latest, config: putty-0.82 }
74+
- { target: ubuntu-latest, config: putty-0.83 }
6875
- { target: ubuntu-latest, config: putty-snapshot }
6976
- { target: ubuntu-latest, config: zlib-develop }
70-
- { target: ubuntu-22.04, config: pam }
71-
- { target: ubuntu-22.04, config: krb5 }
72-
- { target: ubuntu-22.04, config: heimdal }
73-
- { target: ubuntu-22.04, config: libedit }
74-
- { target: ubuntu-22.04, config: sk }
75-
- { target: ubuntu-22.04, config: selinux }
76-
- { target: ubuntu-22.04, config: kitchensink }
77-
- { target: ubuntu-22.04, config: without-bearssl }
78-
- { target: macos-12, config: pam }
77+
- { target: ubuntu-latest, config: tcmalloc }
78+
- { target: ubuntu-latest, config: musl }
79+
- { target: ubuntu-22.04-arm, config: kitchensink }
80+
- { target: ubuntu-24.04-arm, config: kitchensink }
7981
- { target: macos-13, config: pam }
8082
- { target: macos-14, config: pam }
83+
- { target: macos-15, config: pam }
8184
runs-on: ${{ matrix.target }}
8285
steps:
8386
- name: set cygwin git params

‎.github/workflows/selfhosted.yml‎

Lines changed: 57 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
REMOTE: ${{ startsWith(matrix.host, 'remote') }}
2222
VM: ${{ startsWith(matrix.host, 'libvirt') || startsWith(matrix.host, 'persist') }}
2323
SSHFS: ${{ startsWith(matrix.host, 'libvirt') || startsWith(matrix.host, 'persist') || startsWith(matrix.host, 'remote') }}
24+
BIGENDIAN: ${{ matrix.target == 'aix51' || matrix.target == 'fbsd14-ppc64' || matrix.target == 'openwrt-mips' }}
2425
strategy:
2526
fail-fast: false
2627
# We use a matrix in two parts: firstly all of the VMs are tested with the
@@ -40,11 +41,11 @@ jobs:
4041
- fbsd12
4142
- fbsd13
4243
- fbsd14
43-
- minix3
4444
- nbsd3
4545
- nbsd4
4646
- nbsd8
4747
- nbsd9
48+
- nbsd10
4849
- obsd51
4950
- obsd67
5051
- obsd72
@@ -62,6 +63,7 @@ jobs:
6263
include:
6364
# Long-running/slow tests have access to high priority runners.
6465
- { target: aix51, config: default, host: libvirt-hipri }
66+
- { target: fbsd14-ppc64, config: default, host: libvirt-hipri }
6567
- { target: openindiana, config: pam, host: libvirt-hipri }
6668
- { target: sol10, config: default, host: libvirt-hipri }
6769
- { target: sol10, config: pam, host: libvirt-hipri }
@@ -96,14 +98,9 @@ jobs:
9698
- { target: ARM64, config: pam, host: ARM64 }
9799
# Physical hosts with remote runners.
98100
- { target: debian-riscv64, config: default, host: remote-debian-riscv64 }
99-
100101
- { target: openwrt-mips, config: default, host: remote-openwrt-mips }
101102
- { target: openwrt-mipsel, config: default, host: remote-openwrt-mipsel }
102103
steps:
103-
- name: unmount stale workspace
104-
if: env.SSHFS == 'true'
105-
run: fusermount -u ${GITHUB_WORKSPACE} || true
106-
working-directory: ${{ runner.temp }}
107104
- name: shutdown VM if running
108105
if: env.VM == 'true'
109106
run: vmshutdown
@@ -147,6 +144,60 @@ jobs:
147144
if: always() && env.SSHFS == 'true'
148145
run: fusermount -u ${GITHUB_WORKSPACE} || true
149146
working-directory: ${{ runner.temp }}
147+
148+
- name: bigendian interop - mount regress
149+
if: env.SSHFS == 'true' && env.BIGENDIAN == 'true'
150+
run: |
151+
set -x
152+
vmrun sudo chown -R $LOGNAME ~/$(basename ${GITHUB_WORKSPACE}) || true
153+
vmrun "cd $(basename ${GITHUB_WORKSPACE}/regress) && sudo make clean"
154+
sshfs_mount regress
155+
vmrun "sudo mkdir -p $(dirname ${GITHUB_WORKSPACE})"
156+
vmrun "sudo ln -s ~/$(basename ${GITHUB_WORKSPACE}) ${GITHUB_WORKSPACE}"
157+
working-directory: ${{ runner.temp }}
158+
159+
- name: bigendian interop - host build
160+
if: env.SSHFS == 'true' && env.BIGENDIAN == 'true'
161+
run: |
162+
set -x
163+
./.github/configure.sh ${{ matrix.config }}
164+
pwd
165+
ls -ld regress || true
166+
ls -l regress/check-perm || true
167+
make clean
168+
make
169+
170+
- name: bigendian interop - test
171+
if: env.SSHFS == 'true' && env.BIGENDIAN == 'true'
172+
env:
173+
TEST_SSH_UNSAFE_PERMISSIONS: 1
174+
run: |
175+
set -x
176+
echo "#!/bin/sh" >remote_sshd
177+
echo "exec /usr/bin/ssh ${TARGET_DOMAIN} exec /home/builder/$(basename ${GITHUB_WORKSPACE})/sshd "'$@' >>remote_sshd
178+
chmod 755 remote_sshd
179+
make t-exec TEST_SSH_SSHD=`pwd`/remote_sshd LTESTS="try-ciphers kextype keytype"
180+
181+
- name: bigendian interop - save logs
182+
if: failure() && env.BIGENDIAN == 'true'
183+
uses: actions/upload-artifact@main
184+
with:
185+
name: ${{ matrix.target }}-${{ matrix.config }}-interop-logs
186+
path: |
187+
config.h
188+
config.log
189+
regress/*.log
190+
regress/log/*
191+
192+
- name: bigendian interop - unmount regress
193+
if: always() && env.SSHFS == 'true' && env.BIGENDIAN == 'true'
194+
run: fusermount -z -u ${GITHUB_WORKSPACE}/regress || true
195+
working-directory: ${{ runner.temp }}
196+
197+
- name: lazily unmount workspace
198+
if: always() && env.SSHFS == 'true'
199+
run: fusermount -z -u ${GITHUB_WORKSPACE} || true
200+
working-directory: ${{ runner.temp }}
150201
- name: shutdown VM
151202
if: always() && env.VM == 'true'
152203
run: vmshutdown

0 commit comments

Comments
 (0)