Fix CNAME v2

This commit is contained in:
Otto Winter 2018-10-20 19:18:30 +02:00
parent 78375742ff
commit f43c4c29d8
No known key found for this signature in database
GPG Key ID: DB66C0BE6013F97E
2 changed files with 4 additions and 2 deletions

View File

@ -34,6 +34,8 @@ deploy-release:
deploy-beta: deploy-beta:
tags: tags:
- esphomedocs - esphomedocs
variables:
CNAME: beta.esphomelib.com
before_script: before_script:
- mkdir -p /root/.ssh - mkdir -p /root/.ssh
- echo "$GITHUB_BETA_PRIVATE_KEY" | tr -d '\r' >/root/.ssh/id_rsa - echo "$GITHUB_BETA_PRIVATE_KEY" | tr -d '\r' >/root/.ssh/id_rsa
@ -47,7 +49,7 @@ deploy-beta:
- git fetch --force git@github.com:OttoWinter/beta.esphomelib.com.git gh-pages:gh-pages - git fetch --force git@github.com:OttoWinter/beta.esphomelib.com.git gh-pages:gh-pages
- git worktree add _build/html gh-pages - git worktree add _build/html gh-pages
- make ../esphomelib - make ../esphomelib
- CNAME=beta.esphomelib.com make deploy - make deploy
- git -C _build/html push -f git@github.com:OttoWinter/beta.esphomelib.com.git gh-pages - git -C _build/html push -f git@github.com:OttoWinter/beta.esphomelib.com.git gh-pages
only: only:
- rc - rc

View File

@ -34,7 +34,7 @@ $(ESPHOMELIB_PATH):
deploy: cleanhtml doxyg html $(ESPHOMELIB_PATH) deploy: cleanhtml doxyg html $(ESPHOMELIB_PATH)
touch "$(BUILDDIR)/html/.nojekyll" touch "$(BUILDDIR)/html/.nojekyll"
echo $CNAME >"$(BUILDDIR)/html/CNAME" echo "$(CNAME)" >"$(BUILDDIR)/html/CNAME"
git -C "$(BUILDDIR)/html" add --all && git -C "$(BUILDDIR)/html" commit -m "Deploy to gh-pages" git -C "$(BUILDDIR)/html" add --all && git -C "$(BUILDDIR)/html" commit -m "Deploy to gh-pages"
@printf "Run \033[0;36mcd $(BUILDDIR)/html && git push origin gh-pages\033[0m to deploy\n" @printf "Run \033[0;36mcd $(BUILDDIR)/html && git push origin gh-pages\033[0m to deploy\n"