Skip to content

Commit 79b8870

Browse files
committed
Merge pull request #56 from graphql-python/docs-playground
Docs playground
2 parents a924b34 + c589d73 commit 79b8870

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+3017
-142
lines changed

.gitignore

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,12 @@ target/
6363
/tests/django.sqlite
6464

6565
/graphene/index.json
66-
6766
/graphene/meta.json
67+
68+
/meta.json
69+
/index.json
70+
71+
/docs/playground/graphene-js/pypyjs-release-nojit/
72+
/docs/static/playground/lib
73+
74+
/docs/static/playground

.travis.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,30 +26,35 @@ install:
2626
pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls six pytest-django
2727
pip install --download-cache $HOME/.cache/pip/ -e .[django]
2828
python setup.py develop
29+
elif [ "$TEST_TYPE" = build_website ]; then
30+
pip install --download-cache $HOME/.cache/pip/ -e .
31+
python setup.py develop
2932
elif [ "$TEST_TYPE" = lint ]; then
3033
pip install --download-cache $HOME/.cache/pip/ flake8
3134
fi
3235
script:
3336
- |
3437
if [ "$TEST_TYPE" = build_website ]; then
35-
if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
38+
if [ "$TRAVIS_BRANCH" = "docs-playground" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
3639
echo "Building the web."
3740
nvm install 4.0
3841
3942
GH_PAGES_DIR="$TRAVIS_BUILD_DIR"/docs/public
4043
git config --global user.name "Travis CI"
4144
git config --global user.email "[email protected]"
42-
git clone --branch gh-pages --depth=50 \
45+
git clone --branch gh-pages-seg --depth=50 \
4346
https://[email protected]/graphql-python/graphene.git \
4447
$GH_PAGES_DIR
4548
cd docs
46-
npm run build
49+
./playground/graphene-js/build.sh
50+
npm run deploy
4751
cd $GH_PAGES_DIR
4852
git status
53+
git add --intent-to-add .
4954
if ! git diff-index --quiet HEAD --; then
5055
git add -A .
5156
git commit -m "Rebuild website"
52-
git push "https://${GITHUB_TOKEN}@github.com/graphql-python/graphene.git" gh-pages
57+
git push "https://${GITHUB_TOKEN}@github.com/graphql-python/graphene.git" gh-pages-seg
5358
fi
5459
exit
5560
fi

0 commit comments

Comments
 (0)