From ffdf4e9ee1360a114f7172f16b8c23a5a3fce5df Mon Sep 17 00:00:00 2001 From: Mudit Gupta Date: Thu, 29 Nov 2018 18:55:07 +0530 Subject: [PATCH 01/11] Update script fetch correct solc version --- scripts/docs.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/docs.sh b/scripts/docs.sh index db7aba417..205a6ceae 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -32,12 +32,20 @@ create_docs() { cd $WEBSITE_DIRECTORY fi + echo "Fetching solc binary" + curl -L -o solidity-ubuntu-trusty.zip https://github.com/ethereum/solidity/releases/download/v0.4.24/solidity-ubuntu-trusty.zip + unzip solidity-ubuntu-trusty.zip + CWD=$(pwd) + OLD_SOLC_PATH=$SOLC_PATH + export SOLC_PATH=$CWD/solc echo "Generating the API documentation in branch $latestTag" # Command to generate the documentation using the solidity-docgen migrate=$(SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ solidity-docgen -x external/oraclizeAPI.sol,mocks/MockPolyOracle.sol,oracles/PolyOracle.sol $CORE_ROUTE $CORE_ROUTE/contracts $CORE_ROUTE/polymath-developer-portal/) + export SOLC_PATH=$OLD_SOLC_PATH + echo "Successfully docs are generated..." echo "Installing npm dependencies..." From aea6509301ab35b45e5e71a0e7d2a26da5fde89e Mon Sep 17 00:00:00 2001 From: Mudit Gupta Date: Fri, 30 Nov 2018 09:14:59 +0530 Subject: [PATCH 02/11] Added docs generation to CI --- .travis.yml | 2 ++ scripts/docs.sh | 1 + 2 files changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index caddfc523..fdadf2ed6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,10 @@ matrix: before_script: - truffle version - wget -O node_modules/solidity-coverage/lib/app.js https://raw.githubusercontent.com/maxsam4/solidity-coverage/relative-path/lib/app.js + - wget -O node_modules/solidity-docgen/buffer-size/lib/index.js https://raw.githubusercontent.com/maxsam4/solidity-docgen/buffer-size/lib/index.js script: - npm run test + - npm run docs notifications: slack: 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= diff --git a/scripts/docs.sh b/scripts/docs.sh index 205a6ceae..7f631fd06 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -38,6 +38,7 @@ create_docs() { CWD=$(pwd) OLD_SOLC_PATH=$SOLC_PATH export SOLC_PATH=$CWD/solc + curl -o node_modules/solidity-docgen/buffer-size/lib/index.js https://raw.githubusercontent.com/maxsam4/solidity-docgen/buffer-size/lib/index.js echo "Generating the API documentation in branch $latestTag" # Command to generate the documentation using the solidity-docgen From b3767d6930535f72e98c8c511113638bdb0ce62a Mon Sep 17 00:00:00 2001 From: Mudit Gupta Date: Fri, 30 Nov 2018 09:19:03 +0530 Subject: [PATCH 03/11] Path fix --- .travis.yml | 2 +- scripts/docs.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fdadf2ed6..ce5467100 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ matrix: before_script: - truffle version - wget -O node_modules/solidity-coverage/lib/app.js https://raw.githubusercontent.com/maxsam4/solidity-coverage/relative-path/lib/app.js - - wget -O node_modules/solidity-docgen/buffer-size/lib/index.js https://raw.githubusercontent.com/maxsam4/solidity-docgen/buffer-size/lib/index.js + - wget -O node_modules/solidity-docgen/lib/index.js https://raw.githubusercontent.com/maxsam4/solidity-docgen/buffer-size/lib/index.js script: - npm run test - npm run docs diff --git a/scripts/docs.sh b/scripts/docs.sh index 7f631fd06..2441f1e09 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -38,7 +38,7 @@ create_docs() { CWD=$(pwd) OLD_SOLC_PATH=$SOLC_PATH export SOLC_PATH=$CWD/solc - curl -o node_modules/solidity-docgen/buffer-size/lib/index.js https://raw.githubusercontent.com/maxsam4/solidity-docgen/buffer-size/lib/index.js + curl -o node_modules/solidity-docgen/lib/index.js https://raw.githubusercontent.com/maxsam4/solidity-docgen/buffer-size/lib/index.js echo "Generating the API documentation in branch $latestTag" # Command to generate the documentation using the solidity-docgen From 617dd73ee3a4295b244c83aa97ee2fa20ab30164 Mon Sep 17 00:00:00 2001 From: Mudit Gupta Date: Fri, 30 Nov 2018 09:48:51 +0530 Subject: [PATCH 04/11] script fix --- scripts/docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index 2441f1e09..af7f6e395 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -38,7 +38,7 @@ create_docs() { CWD=$(pwd) OLD_SOLC_PATH=$SOLC_PATH export SOLC_PATH=$CWD/solc - curl -o node_modules/solidity-docgen/lib/index.js https://raw.githubusercontent.com/maxsam4/solidity-docgen/buffer-size/lib/index.js + echo "Generating the API documentation in branch $latestTag" # Command to generate the documentation using the solidity-docgen From 89f5351aae258db657297c0535d4df3f9c90a18e Mon Sep 17 00:00:00 2001 From: Mudit Gupta Date: Fri, 30 Nov 2018 10:19:31 +0530 Subject: [PATCH 05/11] Testing travis --- .travis.yml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce5467100..d2b49fea8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,13 +6,21 @@ cache: - node_modules matrix: fast_finish: true -before_script: - - truffle version - - wget -O node_modules/solidity-coverage/lib/app.js https://raw.githubusercontent.com/maxsam4/solidity-coverage/relative-path/lib/app.js - - wget -O node_modules/solidity-docgen/lib/index.js https://raw.githubusercontent.com/maxsam4/solidity-docgen/buffer-size/lib/index.js -script: - - npm run test - - npm run docs + allow_failures: + - env: 'TASK=docs' +jobs: + include: + - stage: Tests and Coverage + install: yarn install + after_install: wget -O node_modules/solidity-coverage/lib/app.js https://raw.githubusercontent.com/maxsam4/solidity-coverage/relative-path/lib/app.js + before_script: truffle version + script: npm run test + - stage: docs + env: 'TASK=docs' + before_install: sudo apt-get -y install build-essential libboost-all-dev libz3-dev + install: yarn install + after_install: wget -O node_modules/solidity-docgen/lib/index.js https://raw.githubusercontent.com/maxsam4/solidity-docgen/buffer-size/lib/index.js + script: npm run docs notifications: slack: 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= From 29b3ba68718e6bcbe0b7f2fb470fafc6cc8be010 Mon Sep 17 00:00:00 2001 From: Mudit Gupta Date: Fri, 30 Nov 2018 10:38:42 +0530 Subject: [PATCH 06/11] Testing travis --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index d2b49fea8..93e7cf768 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,17 +10,18 @@ matrix: - env: 'TASK=docs' jobs: include: + - stage: Docs + env: 'TASK=docs' + before_install: sudo add-apt-repository universe + install: yarn install + after_install: sudo apt-get -y install build-essential libboost-all-dev libz3-dev + before_script: wget -O node_modules/solidity-docgen/lib/index.js https://raw.githubusercontent.com/maxsam4/solidity-docgen/buffer-size/lib/index.js + script: npm run docs - stage: Tests and Coverage install: yarn install after_install: wget -O node_modules/solidity-coverage/lib/app.js https://raw.githubusercontent.com/maxsam4/solidity-coverage/relative-path/lib/app.js before_script: truffle version script: npm run test - - stage: docs - env: 'TASK=docs' - before_install: sudo apt-get -y install build-essential libboost-all-dev libz3-dev - install: yarn install - after_install: wget -O node_modules/solidity-docgen/lib/index.js https://raw.githubusercontent.com/maxsam4/solidity-docgen/buffer-size/lib/index.js - script: npm run docs notifications: slack: 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= From c2411dd89d2146b2ff605444813b4544ea52a256 Mon Sep 17 00:00:00 2001 From: Mudit Gupta Date: Fri, 30 Nov 2018 10:42:04 +0530 Subject: [PATCH 07/11] Testing travis --- .travis.yml | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93e7cf768..07104c831 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,24 +4,19 @@ node_js: cache: directories: - node_modules +before_install: + - sudo add-apt-repository ppa:ethereum/ethereum + - sudo apt-get -y update + - sudo apt-get -y install solc matrix: fast_finish: true - allow_failures: - - env: 'TASK=docs' -jobs: - include: - - stage: Docs - env: 'TASK=docs' - before_install: sudo add-apt-repository universe - install: yarn install - after_install: sudo apt-get -y install build-essential libboost-all-dev libz3-dev - before_script: wget -O node_modules/solidity-docgen/lib/index.js https://raw.githubusercontent.com/maxsam4/solidity-docgen/buffer-size/lib/index.js - script: npm run docs - - stage: Tests and Coverage - install: yarn install - after_install: wget -O node_modules/solidity-coverage/lib/app.js https://raw.githubusercontent.com/maxsam4/solidity-coverage/relative-path/lib/app.js - before_script: truffle version - script: npm run test +before_script: + - truffle version + - wget -O node_modules/solidity-coverage/lib/app.js https://raw.githubusercontent.com/maxsam4/solidity-coverage/relative-path/lib/app.js + - wget -O node_modules/solidity-docgen/lib/index.js https://raw.githubusercontent.com/maxsam4/solidity-docgen/buffer-size/lib/index.js +script: + - npm run docs + - npm run test notifications: slack: 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= From b7b3e367ac695a7ff98a6a11cd241ba1fc9a2440 Mon Sep 17 00:00:00 2001 From: Mudit Gupta Date: Fri, 30 Nov 2018 10:44:02 +0530 Subject: [PATCH 08/11] Testing travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 07104c831..f968febbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ cache: directories: - node_modules before_install: - - sudo add-apt-repository ppa:ethereum/ethereum + - echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum - sudo apt-get -y update - sudo apt-get -y install solc matrix: From af54a213d7456e18a9222e28277deac3a31ab7f8 Mon Sep 17 00:00:00 2001 From: Mudit Gupta Date: Fri, 30 Nov 2018 10:51:56 +0530 Subject: [PATCH 09/11] Testing travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index f968febbe..3f1007b26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ before_install: - echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum - sudo apt-get -y update - sudo apt-get -y install solc + - sudo apt-get -y install libz3 + - sudo apt-get -y install libz3-dev matrix: fast_finish: true before_script: From 0ec99e492eb703939551fbeb42e58280439528e8 Mon Sep 17 00:00:00 2001 From: Mudit Gupta Date: Fri, 30 Nov 2018 11:09:26 +0530 Subject: [PATCH 10/11] Testing travis --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3f1007b26..b2d942c96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,8 @@ cache: directories: - node_modules before_install: - - echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum - - sudo apt-get -y update - - sudo apt-get -y install solc - - sudo apt-get -y install libz3 + - echo -ne '\n' | sudo apt-add-repository -y ppa:hvr/z3 + - sudo apt-get -y update - sudo apt-get -y install libz3-dev matrix: fast_finish: true From 538f7aaaffc9b158dc25e2156a9a9ebdcdccd0f8 Mon Sep 17 00:00:00 2001 From: Mudit Gupta Date: Fri, 30 Nov 2018 11:17:20 +0530 Subject: [PATCH 11/11] Testing travis --- .travis.yml | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index b2d942c96..2265b2d88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,19 +4,24 @@ node_js: cache: directories: - node_modules -before_install: - - echo -ne '\n' | sudo apt-add-repository -y ppa:hvr/z3 - - sudo apt-get -y update - - sudo apt-get -y install libz3-dev matrix: fast_finish: true -before_script: - - truffle version - - wget -O node_modules/solidity-coverage/lib/app.js https://raw.githubusercontent.com/maxsam4/solidity-coverage/relative-path/lib/app.js - - wget -O node_modules/solidity-docgen/lib/index.js https://raw.githubusercontent.com/maxsam4/solidity-docgen/buffer-size/lib/index.js -script: - - npm run docs - - npm run test + allow_failures: + - env: 'TASK=docs' +jobs: + include: + - stage: Tests and Coverage + after_install: wget -O node_modules/solidity-coverage/lib/app.js https://raw.githubusercontent.com/maxsam4/solidity-coverage/relative-path/lib/app.js + before_script: truffle version + script: npm run test + - stage: Docs + env: 'TASK=docs' + before_install: + - echo -ne '\n' | sudo apt-add-repository -y ppa:hvr/z3 + - sudo apt-get -y update + - sudo apt-get -y install libz3-dev + before_script: wget -O node_modules/solidity-docgen/lib/index.js https://raw.githubusercontent.com/maxsam4/solidity-docgen/buffer-size/lib/index.js + script: npm run docs notifications: slack: - 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= + 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= \ No newline at end of file