зеркало из https://github.com/mozilla/neqo.git
chore: Fix various QNS issues (#1799)
* Record client and server logs during run * Fix result comment table formatting * Fix docker image build (on macOS at least)
This commit is contained in:
Родитель
32a2a59e4e
Коммит
6daede078b
|
@ -5,5 +5,6 @@
|
|||
!**/*.rs
|
||||
!**/*.h
|
||||
!**/*.hpp
|
||||
!neqo-crypto/min_version.txt
|
||||
!qns
|
||||
!Cargo.lock
|
||||
|
|
|
@ -91,15 +91,22 @@ runs:
|
|||
- name: Format GitHub comment
|
||||
if: always()
|
||||
run: |
|
||||
if [ -s quic-interop-runner/summary ]; then
|
||||
exit 0
|
||||
fi
|
||||
echo '[**QUIC Interop Runner**](https://github.com/quic-interop/quic-interop-runner)' >> comment
|
||||
echo '' >> comment
|
||||
# Ignore all, but table, which starts with "|".
|
||||
grep -E '^\|' quic-interop-runner/summary >> comment
|
||||
grep -E '^\|' quic-interop-runner/summary |\
|
||||
awk '(!/^\| *:-/ || (d++ && d < 3))' |\
|
||||
sed -E -e 's/✓/:white_check_mark:/gi' -e 's/✕/:x:/gi' -e 's/\?/:grey_question:/gi' \
|
||||
>> comment
|
||||
echo '' >> comment
|
||||
echo "EXPORT_COMMENT=1" >> "$GITHUB_ENV"
|
||||
shell: bash
|
||||
|
||||
- name: Export PR comment data
|
||||
if: always()
|
||||
if: env.EXPORT_COMMENT == '1'
|
||||
uses: ./.github/actions/pr-comment-data-export
|
||||
with:
|
||||
name: qns
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
FROM martenseemann/quic-network-simulator-endpoint:latest AS buildimage
|
||||
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
curl git mercurial \
|
||||
curl git mercurial coreutils \
|
||||
build-essential libclang-dev lld \
|
||||
gyp ninja-build zlib1g-dev python \
|
||||
&& apt-get autoremove -y && apt-get clean -y \
|
||||
|
@ -30,7 +30,7 @@ ADD . /neqo
|
|||
|
||||
RUN set -eux; \
|
||||
cd /neqo; \
|
||||
RUSTFLAGS="-g -C link-arg=-fuse-ld=lld" cargo build --release \
|
||||
RUSTFLAGS="-C link-arg=-fuse-ld=lld" cargo build --release \
|
||||
--bin neqo-client --bin neqo-server
|
||||
|
||||
# Copy only binaries to the final image to keep it small.
|
||||
|
|
|
@ -10,30 +10,27 @@ export PATH="${PATH}:/neqo/bin"
|
|||
[ -n "$QLOGDIR" ]
|
||||
|
||||
case "$ROLE" in
|
||||
client)
|
||||
/wait-for-it.sh sim:57832 -s -t 30
|
||||
sleep 5
|
||||
neqo-client --help | head -n 1
|
||||
RUST_LOG=debug RUST_BACKTRACE=1 neqo-client --cc cubic --qns-test "$TESTCASE" \
|
||||
--qlog-dir "$QLOGDIR" --output-dir /downloads $REQUESTS
|
||||
;;
|
||||
client)
|
||||
/wait-for-it.sh sim:57832 -s -t 30
|
||||
RUST_LOG=debug RUST_BACKTRACE=1 neqo-client --cc cubic --qns-test "$TESTCASE" \
|
||||
--qlog-dir "$QLOGDIR" --output-dir /downloads $REQUESTS 2> >(tee -i -a "/logs/$ROLE.log" >&2)
|
||||
;;
|
||||
|
||||
server)
|
||||
DB=/neqo/db
|
||||
CERT=cert
|
||||
P12CERT=$(mktemp)
|
||||
mkdir -p "$DB"
|
||||
certutil -N -d "sql:$DB" --empty-password
|
||||
openssl pkcs12 -export -nodes -in /certs/cert.pem -inkey /certs/priv.key \
|
||||
-name "$CERT" -passout pass: -out "$P12CERT"
|
||||
pk12util -d "sql:$DB" -i "$P12CERT" -W ''
|
||||
certutil -L -d "sql:$DB" -n "$CERT"
|
||||
neqo-server --help | head -n 1
|
||||
RUST_LOG=info RUST_BACKTRACE=1 neqo-server --cc cubic --qns-test "$TESTCASE" \
|
||||
--qlog-dir "$QLOGDIR" -d "$DB" -k "$CERT" [::]:443
|
||||
;;
|
||||
server)
|
||||
DB=/neqo/db
|
||||
CERT=cert
|
||||
P12CERT=$(mktemp)
|
||||
mkdir -p "$DB"
|
||||
certutil -N -d "sql:$DB" --empty-password
|
||||
openssl pkcs12 -export -nodes -in /certs/cert.pem -inkey /certs/priv.key \
|
||||
-name "$CERT" -passout pass: -out "$P12CERT"
|
||||
pk12util -d "sql:$DB" -i "$P12CERT" -W ''
|
||||
certutil -L -d "sql:$DB" -n "$CERT"
|
||||
RUST_LOG=info RUST_BACKTRACE=1 neqo-server --cc cubic --qns-test "$TESTCASE" \
|
||||
--qlog-dir "$QLOGDIR" -d "$DB" -k "$CERT" '[::]:443' 2> >(tee -i -a "/logs/$ROLE.log" >&2)
|
||||
;;
|
||||
|
||||
*)
|
||||
exit 1
|
||||
;;
|
||||
*)
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
|
Загрузка…
Ссылка в новой задаче