diff --git a/.travis.yml b/.travis.yml index 30ee619f..c30d4206 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,13 @@ env: - WREN_OPTIONS="" CI_ARCHS="ci_32 ci_64" - WREN_OPTIONS="-DWREN_NAN_TAGGING=0" CI_ARCHS="ci_64" -jobs: - include: - - stage: deploy - script: bash util/deploy_docs_from_travis.sh - # Only deploy commits that land on master. - if: branch = master and type = push +# TODO: Enable this once the TODOs in util/deploy_docs_from_travis.sh are fixed. +# jobs: +# include: +# - stage: deploy +# script: bash util/deploy_docs_from_travis.sh +# # Only deploy commits that land on master. +# if: branch = master and type = push # Travis VMs are 64-bit but we compile both for 32 and 64 bit. To enable the # 32-bit builds to work, we need gcc-multilib. diff --git a/util/deploy_docs_from_travis.sh b/util/deploy_docs_from_travis.sh index 54ecb01a..1cb8d6a1 100644 --- a/util/deploy_docs_from_travis.sh +++ b/util/deploy_docs_from_travis.sh @@ -3,6 +3,8 @@ set -e make gh-pages +# TODO: This strips the syntax highlighting because the custom pygments lexer +# isn't installed. git clone https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG} gh-pages-repo cd gh-pages-repo @@ -11,13 +13,15 @@ git checkout gh-pages rm -rf * cp -r ../build/gh-pages/* . +# TODO: Restore CNAME file that gets deleted by `rm -rf *`. + git status -ls +ls if ! $( git diff-index --quiet HEAD ) ; then git config user.name "Travis CI" git config user.email "$COMMIT_AUTHOR_EMAIL" - git add -A . + git add --all . git commit -m "Deploy to GitHub Pages: ${SHA}" - git push + git push fi