Skip to content

Commit

Permalink
Merge branch 'travis'
Browse files Browse the repository at this point in the history
  • Loading branch information
S0lll0s committed Feb 20, 2016
2 parents 9f70d24 + 4f837e4 commit 649f09a
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 13 deletions.
8 changes: 2 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
public/*.html
public/*pdf*
paged
tmp

vendor
.travis/deploy_key.pem

Gemfile.lock
vendor
5 changes: 3 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[submodule "book/code"]
path = book/code
url = git@github.com:love2D-community/love2D-book-code.git
url = https://github.com/love2d-community/love2d-book-code.git
[submodule "public"]
path = public
url = [email protected]:love2D-book/love2D-book.github.io.git
url = https://github.com/love2d-community/love2d-book.git
branch = gh-pages
20 changes: 20 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
language: ruby

rvm:
- 2.3.0

env:
- [email protected]:love2d-community/love2d-book.git
# global:
# - [email protected]:love2d-book/love2d-book.github.io.git

bundler_args: "--without production"
before_install:
- openssl aes-256-cbc -K $encrypted_df9da5f220ff_key -iv $encrypted_df9da5f220ff_iv
-in .travis/deploy_key.pem.enc -out .travis/deploy_key.pem -d

script:
- bundle exec ./render.sh

after_success:
- .travis/deploy.sh
20 changes: 20 additions & 0 deletions .travis/deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash
set -ev
if [ "${TRAVIS_BRANCH}" = "master" ]; then
eval "$(ssh-agent -s)"
chmod 600 .travis/deploy_key.pem
ssh-add .travis/deploy_key.pem

cd public
git remote add pages $REPO_URI
# git remote add io $REPO_IO_URI

git config --global user.email "travis@splashes"
git config --global user.name "Travis Build Bot"

git add .
git commit -m "Update to ${TRAVIS_COMMIT}"

git push pages
# git push io gh-pages:master
fi
Binary file added .travis/deploy_key.pem.enc
Binary file not shown.
1 change: 1 addition & 0 deletions .travis/deploy_key.pub
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDi+IyDRkt4gH8sOt6lOVqdI04/krlXm25EV5TSh9bmvIOk/brkA3InEag/awD/HQ/AYbxVXeluOSei0eHmuEOdgAgQt26zWi4nwJ2wmmCAmnmRPJto+U2LB1LAIRtBeBJR/QBiywacJ/sL3WYolxySgHVnLRNGX7+e6UUiXEySKUZb/ed5Y4zJNWbX93Ck2i9GFyOrXmdVwNZKvVCNbx8LeAQa0QnjYIlRsEuRwB8QNiJMsArV3HOsuwNQS6g7wsOeW8J81t3SgOZVLPPA4ZCDMOjm/4Mz7N9qqrFiCFlSkJYB1bzHrCF3Byo8240FVm9kQ1N/M5H7qDG5iDE1t0TEe1lBb6L/papLbb04Z44dYDZaHIBXuslzoiHRNwUXLDzzIUmgjQe25S+psUeTk/swHlYI1E+Qj2Dn3ioON025+wpzh21fYECYZcJmXLfEMOJPvK5JVZ2ateh+i/B+cjx1eW0YJ4UPnu0zvTxLYQn8LtL1RIPUAcxdf22Q07cJ+miEN3kValbiUS9Qy6dBicPAnJMluVTS8Ndg0onw48yaQeIJeBWNIn+zS/wvJIN71C/52Q87zJeYVQHUWZYrF/bn8yPFZNvXupFho/XJBPRljsUCTJl3eqOMZxWc3oG07EK/S8KuoV5171lj+HUlve8oHuDZx8epR9Iym8y5J7R+Pw== travis@love2d-book
8 changes: 5 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ source 'https://rubygems.org'

gem 'asciidoctor'
gem 'asciidoctor-pdf'
gem 'guard'
gem 'guard-livereload'
gem 'slim'
gem 'thread_safe'
gem 'pygments.rb'

group :production do
gem 'guard'
gem 'guard-livereload'
end
4 changes: 2 additions & 2 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ commit=`git show --format=format:%B -s`
pushd public > /dev/null
git add .
echo $commit | git commit "$@" -aF -
git push origin master:gh-pages
git push io master
git push origin
git push io gh-pages:master
popd > /dev/null

git add public
Expand Down

0 comments on commit 649f09a

Please sign in to comment.