Merge branch 'dev' into stable

marelab · Mar 3, 2018 · c52075f · c52075f
2 parents 6d181b1 + f52a0fd
commit c52075f
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,23 +1,22 @@
 language: python
+
 python:
- - "2.7"
+- '2.7'
 
 install:
- - pip install -U platformio
+- pip install -U platformio
 
 script:
- - pio --version
- - pio run -e deploy
+- pio --version
+- pio run -e deploy
 
 deploy:
  provider: releases
- skip_cleanup: true
- overwrite: true
  api_key:
  secure: DVtDvBE9D2FiTxNkACdJoYrQ0ApV+3HwTMUyLOqZu9uJUtbDX1eqlcfaSoIEyTEyKlzDkWpIbkBN9YeHBQ69jAIxvvmnnwJ9iqc9S80BrGaPzGJ7lMPnHm+88OxXHrv7SDVZf9+0Lv59NNyl1vS9euBV2oBHBM7gMb3wz65thWkePsXT4HlksxMjd7F24dYeZ82nVAhUMYuV0vfOu6ySnQlRq5T9ZxLQcXcSLNg80MZOZI6L3Ptd1L7BYizJrV+yoqq2xpTrKiRLJM7YGIWRXIvohuwrIMpCd5GA/m2KySWEU8slXedlRWy5xSkdpWlGKLdIwCxRCaWWWCZDy6Eze4o+O0WVfNsgvXtg6dYOtwsneQrIuTOiZSuWCdjg7v03nKaiX/DkrdiPgyPHCK9dU9yynb4wKQ9kmXgiG/IDvxSltGLTQ2Y9kJtICY2Xqt+vBizr9HZ97es0dPXpopbaCds+zArxcfVu0oMr9e9c1Twwy3K5d941x5ncQ9hzK0JAkN/lbFvNs+uW88Oq//Xaz+FXamkkfydtBJ8LFCW64JVb4iZwWEXc44ihK3iTG1wubsGWma48DvirijtJrltZLyVzVr3fXF+moAw6kBMrHaQOLYKeR2Qbecx+FV4Alh/FY+zpiZ6FTW3ufZExolmLuGsUsGBWqMTNYOlT3hMsgnk=
  file_glob: true
  file: bin/*
  on:
  repo: omersiar/esp-rfid
  all_branches: true
- condition: $TRAVIS_TAG =~ ^[0-9]+\.[0-9]+$
+ condition: $TRAVIS_TAG =~ ^[0-9]+\.[0-9]+$