Skip to content
This repository was archived by the owner on Jan 31, 2020. It is now read-only.

Commit 6d0c474

Browse files
committed
Merge pull request #59 from froschdesign/hotfix/docs/switch-from-bookdown-to-mkdocs
Switch from Bookdown to MkDocs
2 parents af205f5 + d4d7d93 commit 6d0c474

30 files changed

+61
-30
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
.*.un~
88
nbproject
99
tmp/
10+
doc/html/
11+
zf-mkdoc-theme/
1012

1113
clover.xml
1214
coveralls-upload.json

.travis.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,17 @@ branches:
1010
cache:
1111
directories:
1212
- $HOME/.composer/cache
13+
- $HOME/.local
14+
- zf-mkdoc-theme
1315

1416
env:
1517
global:
1618
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
19+
- SITE_URL: https://zendframework.github.io/zend-view
20+
- GH_USER_NAME: "Matthew Weier O'Phinney"
21+
- GH_USER_EMAIL: [email protected]
22+
- GH_REF: github.com/zendframework/zend-view.git
23+
- secure: ""
1724

1825
matrix:
1926
fast_finish: true
@@ -35,6 +42,8 @@ matrix:
3542
env:
3643
- EXECUTE_TEST_COVERALLS=true
3744
- DEPS=locked
45+
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
46+
- PATH="$HOME/.local/bin:$PATH"
3847
- php: 5.6
3948
env:
4049
- DEPS=lastest
@@ -78,6 +87,10 @@ script:
7887
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi
7988
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then ./vendor/bin/phpunit ; fi
8089
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run ; fi
90+
- if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then wget -O theme-installer.sh "https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh" ; chmod 755 theme-installer.sh ; ./theme-installer.sh ; fi
91+
92+
after_success:
93+
- if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
8194

8295
after_script:
8396
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/coveralls ; fi
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)