diff --git a/.github/workflows/memcached.sh b/.github/workflows/memcached.sh index 7394c14aa..ee563ebd8 100755 --- a/.github/workflows/memcached.sh +++ b/.github/workflows/memcached.sh @@ -1,14 +1,14 @@ #!/bin/sh if [ -z "$GITHUB_WORKSPACE" ]; then - echo '$GITHUB_WORKSPACE is not set' - exit 1 + echo '$GITHUB_WORKSPACE is not set' + exit 1 fi if [ -z "$HOST_ROOT" ]; then - echo '$HOST_ROOT is not set' - exit 1 + echo '$HOST_ROOT is not set' + exit 1 fi chroot $HOST_ROOT make -C $GITHUB_WORKSPACE/memcached \ - -j$(nproc) PARALLEL=$(nproc) test_tls + -j$(nproc) PARALLEL=$(nproc) test_tls diff --git a/.github/workflows/memcached.yml b/.github/workflows/memcached.yml index 50a4fda69..9a4c81317 100644 --- a/.github/workflows/memcached.yml +++ b/.github/workflows/memcached.yml @@ -90,7 +90,7 @@ jobs: MEMCACHED_RES=0 # Not set when command succeeds # Tests should usually take less than 4 minutes. If already taking # 5 minutes then they are probably stuck. Interrupt and re-run. - timeout 5m docker run -v /:/host \ + time timeout -s SIGKILL 5m docker run -v /:/host \ -v $GITHUB_WORKSPACE/build-dir/bin/memcached.sh:/memcached.sh \ -e GITHUB_WORKSPACE=$GITHUB_WORKSPACE \ -e HOST_ROOT=/host \