Merge pull request #470 from sidoh/fix_travis_build

Make travis CI artifact uploading robust to PIO 4.0 directory structure

.gitignore

@@ -1,5 +1,6 @@
 .pioenvs
 .piolibdeps
+.pio
 .clang_complete
 .gcc-flags.json
 .sconsign.dblite

.prepare_release

@@ -6,7 +6,7 @@ prepare_log() {
   echo "[prepare release] -- $@"
 }
 
-if ! git describe --exact-match HEAD 2>/dev/null; then
+if [ -z "$(git tag -l --points-at HEAD)" ]; then
   prepare_log "Skipping non-tagged commit."
   exit 0
 fi
@@ -17,7 +17,13 @@ prepare_log "Preparing release for tagged version: $VERSION"
 
 mkdir -p dist
 
-for file in $(ls .pioenvs/**/firmware.bin); do
+if [ -d .pio/build ]; then
+  firmware_prefix=".pio/build"
+else
+  firmware_prefix=".pioenvs"
+fi
+
+for file in $(ls ${firmware_prefix}/**/firmware.bin); do
   env_dir=$(dirname "$file")
   env=$(basename "$env_dir")
 

.travis.yml

@@ -10,7 +10,7 @@ env:
 before_install:
   - nvm install $NODE_VERSION
 install:
-- pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
+- pip install -U platformio
 - platformio lib install
 - cd web && npm install && cd ..
 script: