From e0b64fc350b419678c0d6af975297619dad917fa Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Thu, 2 Jun 2016 21:31:23 -0700 Subject: [PATCH 1/2] Update Travis deployment docs --- content/docs/deployment/travisci/contents.lr | 21 ++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/content/docs/deployment/travisci/contents.lr b/content/docs/deployment/travisci/contents.lr index 23a6f35e..ccb3773a 100644 --- a/content/docs/deployment/travisci/contents.lr +++ b/content/docs/deployment/travisci/contents.lr @@ -30,12 +30,15 @@ file into your repository. You can copy paste this over: language: python python: 2.7 install: "pip install Lektor" -script: "lektor build && lektor deploy ghpages" +script: "lektor build" +deploy: + provider: script + script: "lektor deploy ghpages" ``` Because Travis already comes with all dependencies we need other than Lektor itself we just need to pip install Lektor and we're ready to go. For -the build step we just invoke `lektor build` and on success we invoke +the build step we invoke `lektor build`, and for the deploy step we invoke `lektor deploy ghpages` to ship it to the ghpages server. We still need to configure that. @@ -122,7 +125,10 @@ cache: - $HOME/.cache/pip - $HOME/.cache/lektor/builds install: "pip install Lektor" -script: "lektor build && lektor deploy ghpages" +script: "lektor build" +deploy: + provider: script + script: "lektor deploy ghpages" ``` ## Restricting Branches @@ -139,7 +145,10 @@ cache: - $HOME/.cache/pip - $HOME/.cache/lektor/builds install: "pip install Lektor" -script: - - "lektor build" - - 'test "$TRAVIS_PULL_REQUEST" == false && test "$TRAVIS_BRANCH" == master && lektor deploy ghpages' +script: "lektor build" +deploy: + provider: script + script: "lektor deploy ghpages" + on: + branch: master ``` From 8d8b490c390ec1394b342079343d191392c93765 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Thu, 2 Jun 2016 21:31:37 -0700 Subject: [PATCH 2/2] Update lektor-atom to 0.2 --- Website.lektorproject | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Website.lektorproject b/Website.lektorproject index 2e51c9c7..19c4b797 100644 --- a/Website.lektorproject +++ b/Website.lektorproject @@ -15,4 +15,4 @@ lektor-disqus-comments = 0.1 lektor-markdown-header-anchors = 0.1 lektor-markdown-highlighter = 0.1 lektor-markdown-admonition = 0.1 -lektor-atom = 0.1 +lektor-atom = 0.2