Merge branch 'master' of https://github.com/csgregg/csg-esp8266-rota

Author: csgregg

.travis.yml

@@ -6,6 +6,8 @@ cache:
   directories:
   - "~/.platformio"
 
+if: tag =~ /^\d+(?:\.\d+){2}$/
+
 env:
   matrix:
   - PLATFORMIO_CI_SRC=src/
@@ -34,11 +36,11 @@ addons:
   ssh_known_hosts: iot.greggs.org
 # Setup ssh to goDaddy with key
 before_deploy:
-- openssl aes-256-cbc -K $encrypted_c79cb383f093_key -iv $encrypted_c79cb383f093_iv
-  -in travis-godaddy_rsa.enc -out travis-godaddy_rsa -d
+- openssl aes-256-cbc -K $encrypted_29231b0f8d8a_key -iv $encrypted_29231b0f8d8a_iv
+  -in godaddy-travis_rsa.enc -out godaddy-travis_rsa -d
 - eval "$(ssh-agent -s)"
-- chmod 600 travis-godaddy_rsa
-- ssh-add travis-godaddy_rsa
+- chmod 600 godaddy-travis_rsa
+- ssh-add godaddy-travis_rsa
 
 # Deploy binaries
 deploy:
@@ -48,7 +50,6 @@ deploy:
     on:
       repo: csgregg/csg-esp8266-rota
       all_branches: true
-      condition: "$TRAVIS_TAG =~ ^[0-9]+\\.[0-9]+\\.[0-9]+$"
     api_key:
       secure: c19w5t9Nw8B58j9hYx7fKWQ4x79kQjSQffZwodePpqdp2yyS3nVW/z+NZPugSPX0FkahAGDdlSjdGlWgp6QQrtB4yV2w+k9mIjxwk6IF3LxY9z0wpnqiuGHDjEG0n887MhU3quQ9Dq/NqUCWn72aYPFZcNXCIwKELv5L5UI745zE7TnSoKLuGd1Hrhd5S6qOfCBxfMYsrHMMYCRH3sGthL07gUqBAYcwHX2nqqlRW9j9m+ebsdqghVoyQSZLElJzKLomc4VtgvmRrRs5hjjZO00RDARje/DnLxQa2NS6npgJhuaOtMd/tGzU0aruhccbUm75O2oKDnRtU5knwcCY1x1Y/x7jc4s88EL5jDQ34oTPYRH59v350GYkczvREPDQMICKrNySW6VcAj0JTvQDMpGrnXqxzgNz60YbVJbWT0gwFU9tyTVcDj8Nx5FdNKz9OAEI5yN4j7blcXm3u03pKeTCOqTz/Fv4saK54VBcJ4hwiObinNZ4NhvFhy6lmFjwIu7iRsSZO185YD6EhgsDvwKrsMonUC+R6TN1Hw0puBqiJyrebOoxy51SuWADwVeWgrsdOAEpFHcmvWCtN2pL+jOgqMK1dq5hEpGVnAyYe79Y69KiezTdu+/marXq1II8BB1sEyqhmSd+fjLdgrymVhOC3MRpx8h6dPU+1A71i88=
     file_glob: true
@@ -62,9 +63,9 @@ deploy:
     skip_cleanup: true
     script:
     # Sync files and folders
-      - rsync -r --delete-after $TRAVIS_BUILD_DIR/hosted/iot.greggs.org/ [email protected]:public_html
+      - rsync -r --delete-after --verbose $TRAVIS_BUILD_DIR/hosted/iot.greggs.org/ [email protected]:public_html
       - chmod 600 /public_html/tools/*
     on:
       all_branches: true
-      condition: "$TRAVIS_TAG =~ ^[0-9]+\\.[0-9]+\\.[0-9]+$"
+
 

scripts/FS_pre.py

@@ -66,7 +66,7 @@ def minify_file(file,url):
     print("Minifying: " + str(file))
     data = {'input': open(file, 'rb').read()}
     response = requests.post(url, data=data)
-    time.sleep(1)
+#    time.sleep(1)
     minified = response.content
     with open(file, 'wb') as f_out:
         f_out.write(minified)