Merge remote-tracking branch 'origin/current' into next

This commit is contained in:
Otto Winter 2018-10-16 20:53:48 +02:00
commit c978bdc81e
No known key found for this signature in database
GPG Key ID: DB66C0BE6013F97E

View File

@ -3,6 +3,7 @@ build:
tags:
- esphomedocs
script:
- make ../esphomelib
- make html
except:
- current
@ -22,6 +23,7 @@ deploy:
script:
- git fetch --force git@github.com:OttoWinter/esphomedocs.git gh-pages:gh-pages
- git worktree add _build/html gh-pages
- make ../esphomelib
- make deploy
- git -C _build/html push git@github.com:OttoWinter/esphomedocs.git gh-pages
artifacts: