From 784605d2580331322f3fb3a1e67c6b6cae46d7b3 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Mon, 18 Jul 2016 14:11:21 +0200 Subject: [PATCH 1/5] junk commit to test travis flow --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1e3f405..cc675dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: ruby rvm: - 2.3.1 + notifications: slack: secure: tej68wbYns4DYg488iz+4ncU3/CHJvG/5c1qntGcEjti6vZp24atuH32BzNMY+gqa5ftZtcRfqIiJ0I0tkbiFWEDzjSk89bgjG4sgwXq1gMqi/Fj4bqEpjU5m7QLa786q4UfYyTF+srca1fHPLVS5REdGjRr2wxX+bcFnTRxreGCIrlNdWhoZPPJyS37R4RR9k+l5ZWZnqWgUN6bD448O8EzMRVRWoUSxQcJ6+u4QLpinEvem4iXe+WcHOyFfsNmavxGGMMpkOSed/tzA1l+gNpl224qOJl3yAk2qrGi4N6SOnSkeJFfUO5RzX56KDC/tcCL1oJpamhDmzDvRrbDNnCjSriv+g+PkXEjiwBF/tkZwIe7nMKyc9QF698Zvdgb6Ffbq21obsRnkkddkxijthdbUKMAIREPQuU7pXRL4ykPkBeB5GkNjPlErOooxvUHvQEVElJ8NMD4ychQqW6relaYJ0W0uy0QMvrtS+cHkpprZAOZzWLa3AdEOvD50kiS2hDhJway5JHJg/LMl3I6XVVMx6fNGdNWBcezeCqkDZM+nuMJqgAtQ+Tz8bwrHLCJgS5u0lQq/MbrDkYdpmmzvA5LXxn2SpjfOAlgiFKnSIwKSuuuwzW/zCEGdPo1pfBba2VfYAN4y1l863j5ph+eMtlHf7JG8mzIWTo3k+Jx8lQ= From 9caec56fe79030471b5eeb59bb22fa3c8c6f3c68 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Mon, 18 Jul 2016 14:27:38 +0200 Subject: [PATCH 2/5] add deploy script which only deploys on master --- .travis.yml | 3 ++- .travis/deploy.sh | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .travis/deploy.sh diff --git a/.travis.yml b/.travis.yml index cc675dc..b98bf9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,4 +19,5 @@ script: - bundle exec nanoc check mixed_content after_success: - chmod 600 ~/.ssh/id_rsa -- bundle exec nanoc deploy --target public +- chmod +x .travis/deploy.sh +- .travis/deploy.sh diff --git a/.travis/deploy.sh b/.travis/deploy.sh new file mode 100644 index 0000000..dc1fa56 --- /dev/null +++ b/.travis/deploy.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +if [[ $TRAVIS_BRANCH == 'master' ]] + bundle exec nanoc deploy --target public +fi From 93f1d78c5399c8750708b735302a85037eea1262 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Mon, 18 Jul 2016 14:31:22 +0200 Subject: [PATCH 3/5] seems i forgot how to bash --- .travis/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/deploy.sh b/.travis/deploy.sh index dc1fa56..65ce9f2 100644 --- a/.travis/deploy.sh +++ b/.travis/deploy.sh @@ -1,5 +1,5 @@ #!/bin/bash -if [[ $TRAVIS_BRANCH == 'master' ]] +if [[ $TRAVIS_BRANCH == 'master' ]]; then bundle exec nanoc deploy --target public fi From 6daef7e15ef1f147880dacd54b2256f4d6fc69b6 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Mon, 18 Jul 2016 14:35:09 +0200 Subject: [PATCH 4/5] enhance deploy script --- .travis/deploy.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis/deploy.sh b/.travis/deploy.sh index 65ce9f2..b2ec0e1 100644 --- a/.travis/deploy.sh +++ b/.travis/deploy.sh @@ -1,5 +1,8 @@ #!/bin/bash if [[ $TRAVIS_BRANCH == 'master' ]]; then + echo "Deploying site..." bundle exec nanoc deploy --target public +else + echo "Not deploying." fi From 8df6eeacefe0377299ce44c11eae5852314eb297 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Mon, 18 Jul 2016 14:37:59 +0200 Subject: [PATCH 5/5] add bundler caching --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b98bf9d..4b99c9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: ruby +cache: bundler rvm: - 2.3.1