Skip to content

Commit 12b1680

Browse files
authored
Merge pull request #449 from PolymathNetwork/docs-fix-master
Docs fix master
2 parents d16971c + f8724b9 commit 12b1680

File tree

2 files changed

+26
-10
lines changed

2 files changed

+26
-10
lines changed

.travis.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,22 @@ cache:
66
- node_modules
77
matrix:
88
fast_finish: true
9-
before_install:
10-
- echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum
11-
- sudo apt-get -y update
12-
- sudo apt-get -y install solc
13-
before_script:
14-
- truffle version
15-
- wget -O node_modules/solidity-coverage/lib/app.js https://github.com/raw/maxsam4/solidity-coverage/relative-path/lib/app.js
16-
script:
17-
- npm run test
9+
allow_failures:
10+
- env: 'TASK=docs'
11+
jobs:
12+
include:
13+
- stage: Tests and Coverage
14+
after_install: wget -O node_modules/solidity-coverage/lib/app.js https://github.com/raw/maxsam4/solidity-coverage/relative-path/lib/app.js
15+
before_script: truffle version
16+
script: npm run test
17+
- stage: Docs
18+
env: 'TASK=docs'
19+
before_install:
20+
- echo -ne '\n' | sudo apt-add-repository -y ppa:hvr/z3
21+
- sudo apt-get -y update
22+
- sudo apt-get -y install libz3-dev
23+
before_script: wget -O node_modules/solidity-docgen/lib/index.js https://github.com/raw/maxsam4/solidity-docgen/buffer-size/lib/index.js
24+
script: npm run docs
1825
notifications:
1926
slack:
20-
secure: W4FZSabLrzF74f317hutolEHnlq2GBlQxU6b85L5XymrjgLEhlgE16c5Qz7Emoyt6le6PXL+sfG2ujJc3XYys/6hppgrHSAasuJnKCdQNpmMZ9BNyMs6WGkmB3enIf3K/FLXb26AQdwpQdIXuOeJUTf879u+YoiZV0eZH8d3+fsIOyovq9N6X5pKOpDM9iT8gGB4t7fie7xf51s+iUaHxyO9G7jDginZ4rBXHcU7mxCub9z+Z1H8+kCTnPWaF+KKVEXx4Z0nI3+urboD7E4OIP02LwrThQls2CppA3X0EoesTcdvj/HLErY/JvsXIFiFEEHZzB1Wi+k2TiOeLcYwEuHIVij+HPxxlJNX/j8uy01Uk8s4rd+0EhvfdKHJqUKqxH4YN2npcKfHEss7bU3y7dUinXQfYShW5ZewHdvc7pnnxBTfhvmdi64HdNrXAPq+s1rhciH7MmnU+tsm4lhrpr+FBuHzUMA9fOCr7b0SQytZEgWpiUls88gdbh3yG8TjyZxmZJGx09cwEP0q7VoH0UwFh7mIu5XmYdd5tWUhavTiO7YV8cUPn7MvwMsTltB3YBpF/fB26L7ka8zBhCsjm9prW6SVYU/dyO3m91VeZtO/zJFHRDA6Q58JGVW2rgzO39z193qC1EGRXqTie96VwAAtNg8+hRb+bI/CWDVzSPc=
27+
secure: W4FZSabLrzF74f317hutolEHnlq2GBlQxU6b85L5XymrjgLEhlgE16c5Qz7Emoyt6le6PXL+sfG2ujJc3XYys/6hppgrHSAasuJnKCdQNpmMZ9BNyMs6WGkmB3enIf3K/FLXb26AQdwpQdIXuOeJUTf879u+YoiZV0eZH8d3+fsIOyovq9N6X5pKOpDM9iT8gGB4t7fie7xf51s+iUaHxyO9G7jDginZ4rBXHcU7mxCub9z+Z1H8+kCTnPWaF+KKVEXx4Z0nI3+urboD7E4OIP02LwrThQls2CppA3X0EoesTcdvj/HLErY/JvsXIFiFEEHZzB1Wi+k2TiOeLcYwEuHIVij+HPxxlJNX/j8uy01Uk8s4rd+0EhvfdKHJqUKqxH4YN2npcKfHEss7bU3y7dUinXQfYShW5ZewHdvc7pnnxBTfhvmdi64HdNrXAPq+s1rhciH7MmnU+tsm4lhrpr+FBuHzUMA9fOCr7b0SQytZEgWpiUls88gdbh3yG8TjyZxmZJGx09cwEP0q7VoH0UwFh7mIu5XmYdd5tWUhavTiO7YV8cUPn7MvwMsTltB3YBpF/fB26L7ka8zBhCsjm9prW6SVYU/dyO3m91VeZtO/zJFHRDA6Q58JGVW2rgzO39z193qC1EGRXqTie96VwAAtNg8+hRb+bI/CWDVzSPc=

scripts/docs.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,21 @@ create_docs() {
3232
cd $WEBSITE_DIRECTORY
3333
fi
3434

35+
echo "Fetching solc binary"
36+
curl -L -o solidity-ubuntu-trusty.zip https://github.com/ethereum/solidity/releases/download/v0.4.24/solidity-ubuntu-trusty.zip
37+
unzip solidity-ubuntu-trusty.zip
38+
CWD=$(pwd)
39+
OLD_SOLC_PATH=$SOLC_PATH
40+
export SOLC_PATH=$CWD/solc
41+
3542
echo "Generating the API documentation in branch $latestTag"
3643
# Command to generate the documentation using the solidity-docgen
3744

3845
migrate=$(SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \
3946
solidity-docgen -x external/oraclizeAPI.sol,mocks/MockPolyOracle.sol,oracles/PolyOracle.sol $CORE_ROUTE $CORE_ROUTE/contracts $CORE_ROUTE/polymath-developer-portal/)
4047

48+
export SOLC_PATH=$OLD_SOLC_PATH
49+
4150
echo "Successfully docs are generated..."
4251

4352
echo "Installing npm dependencies..."

0 commit comments

Comments
 (0)