diff --git a/.travis.yml b/.travis.yml index 491624a..6150cff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ node_js: git: submodules: true depth: false +if: tag IS blank services: - docker before_install: diff --git a/PUSH_REQUIREMENTS.md b/PUSH_REQUIREMENTS.md index f1287ed..497020e 100644 --- a/PUSH_REQUIREMENTS.md +++ b/PUSH_REQUIREMENTS.md @@ -38,4 +38,8 @@ v0.2.3: When pushes are done on other branches, nothing gets deployed anywhere, but the build can still fail if: 1. There are compilation errors in the firmware build - which is a good way to see if changing something in the code breaks the build. -1. The changelog is not updated to the next version. \ No newline at end of file +1. The changelog is not updated to the next version. + +## Avoiding the CI Build + +If you wish to skip the build on a commit, just add to its commit message `[ci skip]`. Note that in case multiple commits are pushed together, the skip command is effective only if it is present in the commit message of the HEAD commit. \ No newline at end of file diff --git a/README.md b/README.md index 9b4ef07..721e8af 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -## GiggleBot MicroPython for the BBC Micro:bit +## GiggleBot MicroPython for the BBC Micro:bit +[![Build Status](https://travis-ci.org/RobertLucian/micropython-gigglebot.svg?branch=master)](https://travis-ci.org/RobertLucian/micropython-gigglebot) This is the source code for MicroPython that's running on the BBC micro:bit + GiggleBot robot. diff --git a/build.sh b/build.sh index 39ca38c..84a132d 100644 --- a/build.sh +++ b/build.sh @@ -37,8 +37,10 @@ docker container cp gupy-container:/src/tmp/ build/ # update cache image on docker hub docker image push $IMAGE_NAME -pushd build -tar -cvzf $(cat $TRAVIS_BUILD_DIR/integration/tag)-mpy-modules.tar.gz tmp/*.mpy -tar -cvzf $(cat $TRAVIS_BUILD_DIR/integration/tag)-py-modules.tar.gz tmp/*.py +pushd build/tmp +tar -cvzf $(cat $TRAVIS_BUILD_DIR/integration/tag)-mpy-modules.tar.gz *.mpy +tar -cvzf $(cat $TRAVIS_BUILD_DIR/integration/tag)-py-modules.tar.gz *.py +cd .. +mv tmp/*.tar.gz . mv firmware.hex $(cat $TRAVIS_BUILD_DIR/integration/tag)-dexterindustries-gb-firmware.hex popd \ No newline at end of file