diff options
| -rwxr-xr-x | simpleci.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/simpleci.sh b/simpleci.sh index 2fef632..57c2ff5 100755 --- a/simpleci.sh +++ b/simpleci.sh @@ -49,8 +49,9 @@ trigger() { # echo BRANCH=${BRANCH} # echo COMMAND=${COMMAND} # echo DIR=${DIR} - # echo FORCE=${FORCE} +# echo FORCE=${FORCE} + pushd ${LOG_DIR} > /dev/null git checkout -B ${DIR} echo > build.log @@ -66,13 +67,18 @@ trigger() { git pull origin ${BRANCH} >> ${LOG_DIR}/build.log 2>&1 ${COMMAND} >> ${LOG_DIR}/build.log 2>&1 popd > /dev/null + HAS_RUN=1 fi fi pushd ${LOG_DIR} > /dev/null - git add build.log - git commit -m "Build ${TIMESTAMP}" - git push -u origin "${DIR}" + if [ "${HAS_RUN}" ] ; then + git add build.log + git commit -m "Build ${TIMESTAMP}" + git push -u origin "${DIR}" + else + git checkout build.log + fi popd > /dev/null } |