Skip to content

Commit

Permalink
Merge pull request #3 from sebgroup/develop
Browse files Browse the repository at this point in the history
first successful travis build
  • Loading branch information
Mason authored Mar 21, 2019
2 parents f5a6729 + fa957ed commit e500fb8
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 36 deletions.
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@ cache:
- $HOME/.npm

script:
- npm run test
- if [ "$TRAVIS_BRANCH" == "master" ];
then npm run build;
else npm run docs;
fi
- npm run build
- export APPLITOOLS_BATCH_ID=`echo ${TRAVIS_PULL_REQUEST_SHA:=$TRAVIS_COMMIT}`

deploy:
Expand Down
2 changes: 1 addition & 1 deletion develop/components/pages/ImagePage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from "react";
import { Image } from "../../../src/image/Image";
import { Image } from "../../../src/Image/Image";
import { getParameterByName } from "../../utils/queryString";
const Highlight = (require("react-highlight")).default;
const docMD = require("../../../src/Image/readme.md");
Expand Down
2 changes: 1 addition & 1 deletion docs/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/js/12.bundle.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e500fb8

Please sign in to comment.