2
0
mirror of https://github.com/koreader/koreader synced 2024-10-31 21:20:20 +00:00

Merge pull request #1881 from koreader/houqp-master

doc: use git add -A to pick up deleted files in travis
This commit is contained in:
Frans de Jonge 2016-03-11 14:29:43 +01:00
commit 70fb3f8a6e
2 changed files with 2 additions and 1 deletions

View File

@ -31,7 +31,7 @@ if [ ${TRAVIS_PULL_REQUEST} = false ] && [ ${TRAVIS_BRANCH} = 'master' ]; then
cp -r doc/html/* koreader_doc/
pushd koreader_doc
git add .
git add -A
echo -e "\n${ANSI_GREEN}Pusing document update..."
git -c user.name="KOReader build bot" -c user.email="non-reply@koreader.rocks" \
commit -a --amend -m 'Automated documentation build from travis-ci.'

View File

@ -143,6 +143,7 @@ end
function Kobo:resume()
os.execute("echo 0 > /sys/power/state-extended")
-- HACK: wait a bit for the kernel to catch up
os.execute("sleep 0.1")
-- cf. #1862, I can reliably break IR touch input on resume...
if os.getenv("FROM_NICKEL") == "true" then