Upstream/esphome-docs
1
0
Fork 0
mirror of https://github.com/esphome/esphome-docs.git synced 2024-09-29 04:27:32 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

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