From 0262dc3bbb6aa991b95b5bc4958b9f3a208d0d76 Mon Sep 17 00:00:00 2001 From: "Zhuohuan LI (CARPE DIEM)" Date: Fri, 4 Nov 2016 14:26:36 +0000 Subject: [PATCH] confirm circleci docker test is fixed? --- package.json | 2 +- script/docker.sh | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 2942e691..fadba90d 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "eslint": "eslint \"{bin,example,src,test}/**/*.js\"", "tslint": "tslint \"{bin,example,src,test}/**/*.ts\" && tsc --noEmit", "shlint": "bash -n bin/*.sh && shellcheck bin/*.sh", - "pretest": "npm run clean && npm run lint && npm run build", + "pretest": "false && npm run clean && npm run lint && npm run build", "sloc": "sloc bin example src test index.ts --details --format cli-table --keys total,source,comment && sloc bin example src test index.ts", "test": "npm run test:chrome", "posttest": "npm run clean && npm run sloc", diff --git a/script/docker.sh b/script/docker.sh index b6ef0eb7..98de4c4f 100755 --- a/script/docker.sh +++ b/script/docker.sh @@ -11,9 +11,15 @@ optRm='--rm' if [ "$1" = "build" ] || [ "$1" = "" ]; then echo docker build "$optRm" -t "$imageName" . exec docker build "$optRm" -t "$imageName" . - exit $? + + ret=$? + echo "ERROR: exec return $ret ???" + exit $ret fi echo docker run -ti "$optRm" -v /dev/shm:/dev/shm "$imageName" $@ exec docker run -ti "$optRm" -v /dev/shm:/dev/shm "$imageName" $@ -exit $? + +ret=$? +echo "ERROR: exec return $ret ???" +exit $ret -- GitLab