Skip to content

Commit ae403a6

Browse files
committed
Don't exit remote server when binary fails
1 parent 9a4ac8b commit ae403a6

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

src/ci/docker/run.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ else
161161
args="$args --env LOCAL_USER_ID=`id -u`"
162162
fi
163163

164+
echo Starting container
165+
164166
docker \
165167
run \
166168
--workdir /checkout/obj \
@@ -179,7 +181,6 @@ docker \
179181
--env TOOLSTATE_PUBLISH \
180182
--env CI_JOB_NAME="${CI_JOB_NAME-$IMAGE}" \
181183
--init \
182-
--rm \
183184
rust-ci \
184185
/checkout/src/ci/run.sh
185186

src/ci/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
set -e
3+
set -e -x
44

55
if [ -n "$CI_JOB_NAME" ]; then
66
echo "[CI_JOB_NAME=$CI_JOB_NAME]"

src/tools/remote-test-server/src/main.rs

+3
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@ fn handle_run(socket: TcpStream, work: &Path, lock: &Mutex<()>) {
227227
Some(n) => (0, n),
228228
None => (1, status.signal().unwrap()),
229229
};
230+
if code != 0 {
231+
loop {}
232+
}
230233
t!(socket.lock().unwrap().write_all(&[
231234
which,
232235
(code >> 24) as u8,

0 commit comments

Comments
 (0)