diff options
| author | chriseth <chris@ethereum.org> | 2018-02-22 00:22:01 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 00:22:01 +0800 |
| commit | 7cec049285b738c08b173a14b044c540539af123 (patch) | |
| tree | 20a9d320018c524e47fb8712134a0e3d6d6e16ed | |
| parent | 16c7eabc1c01328954af35c2e93f601ed26b9776 (diff) | |
| parent | a048d69c03061a2b1429a02c06a48e4d6e6e6563 (diff) | |
| download | dexon-solidity-7cec049285b738c08b173a14b044c540539af123.tar.gz dexon-solidity-7cec049285b738c08b173a14b044c540539af123.tar.zst dexon-solidity-7cec049285b738c08b173a14b044c540539af123.zip | |
Merge pull request #3548 from ethereum/documentationOnCircle
Build documentation on CircleCI.
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | circle.yml | 25 |
2 files changed, 24 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index ebe91939..0b05f661 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,6 @@ env: global: - ENCRYPTION_LABEL="6d4541b72666" - SOLC_BUILD_TYPE=RelWithDebInfo - - SOLC_DOCS=Off - SOLC_EMSCRIPTEN=Off - SOLC_INSTALL_DEPS_TRAVIS=On - SOLC_RELEASE=On @@ -65,18 +64,6 @@ matrix: - ZIP_SUFFIX=ubuntu-trusty-clang - SOLC_STOREBYTECODE=On - # Documentation target, which generates documentation using Phoenix / ReadTheDocs. - - os: linux - dist: trusty - sudo: required - compiler: gcc - before_install: - - sudo apt-get -y install python-sphinx - env: - - SOLC_DOCS=On - - SOLC_RELEASE=Off - - SOLC_TESTS=Off - # Docker target, which generates a statically linked alpine image - os: linux dist: trusty @@ -184,7 +171,6 @@ before_script: script: - test $SOLC_EMSCRIPTEN != On || (scripts/test_emscripten.sh) - - test $SOLC_DOCS != On || (scripts/docs.sh) - test $SOLC_TESTS != On || (cd $TRAVIS_BUILD_DIR && scripts/tests.sh) - test $SOLC_STOREBYTECODE != On || (cd $TRAVIS_BUILD_DIR && scripts/bytecodecompare/storebytecode.sh) @@ -101,7 +101,7 @@ jobs: - run: name: Store commit hash and prerelease command: | - date -u +"nightly.%Y.%-m.%-d" > prerelease.txt + if [ "$CIRCLE_BRANCH" = release -o -n "$CIRCLE_TAG" ]; then echo -n > prerelease.txt; else date -u +"nightly.%Y.%-m.%-d" > prerelease.txt; fi echo -n "$CIRCLE_SHA1" > commit_hash.txt - restore_cache: key: ccache-{{ arch }}-{{ .Branch }} @@ -130,6 +130,28 @@ jobs: path: build/solc/solc destination: solc + docs: + docker: + - image: buildpack-deps:artful + steps: + - checkout + - run: + name: Install build dependencies + command: | + apt-get -qq update + apt-get -qy install python-sphinx + - run: + name: Store commit hash and prerelease + command: | + if [ "$CIRCLE_BRANCH" = release -o -n "$CIRCLE_TAG" ]; then echo -n > prerelease.txt; else date -u +"nightly.%Y.%-m.%-d" > prerelease.txt; fi + echo -n "$CIRCLE_SHA1" > commit_hash.txt + - run: + name: Build documentation + command: ./scripts/docs.sh + - store_artifacts: + path: docs/_build/html/ + destination: docs-html + workflows: version: 2 build_all: @@ -142,3 +164,4 @@ workflows: requires: - build_emscripten - build_x86 + - docs |