Skip to content

Commit 1bf0d8c

Browse files
committed
Use SIGKILL to actually kill the runner
1 parent 21381b9 commit 1bf0d8c

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/memcached.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#!/bin/sh
22

33
if [ -z "$GITHUB_WORKSPACE" ]; then
4-
echo '$GITHUB_WORKSPACE is not set'
5-
exit 1
4+
echo '$GITHUB_WORKSPACE is not set'
5+
exit 1
66
fi
77

88
if [ -z "$HOST_ROOT" ]; then
9-
echo '$HOST_ROOT is not set'
10-
exit 1
9+
echo '$HOST_ROOT is not set'
10+
exit 1
1111
fi
1212

1313
chroot $HOST_ROOT make -C $GITHUB_WORKSPACE/memcached \
14-
-j$(nproc) PARALLEL=$(nproc) test_tls
14+
-j$(nproc) PARALLEL=$(nproc) test_tls

.github/workflows/memcached.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
MEMCACHED_RES=0 # Not set when command succeeds
9191
# Tests should usually take less than 4 minutes. If already taking
9292
# 5 minutes then they are probably stuck. Interrupt and re-run.
93-
timeout 5m docker run -v /:/host \
93+
time timeout -s SIGKILL 5m docker run -v /:/host \
9494
-v $GITHUB_WORKSPACE/build-dir/bin/memcached.sh:/memcached.sh \
9595
-e GITHUB_WORKSPACE=$GITHUB_WORKSPACE \
9696
-e HOST_ROOT=/host \

0 commit comments

Comments
 (0)