diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2020-10-08 16:59:11 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-08 16:59:11 -0600 |
| commit | 8d9a048d74df64a6ff9ee6b862d99a5fcb1257b2 (patch) | |
| tree | 193876ce918b94eed6f55c64d4b1a6818ad05b94 | |
| parent | d3d594039815cbdae8e9afd281d629d0ee266b84 (diff) | |
| parent | 16934bee9bcb15f4a6a9946dc710a8a8fd535286 (diff) | |
| download | numpy-8d9a048d74df64a6ff9ee6b862d99a5fcb1257b2.tar.gz | |
Merge pull request #17485 from mattip/circleci1
BLD: circleCI- merge before build, add -n to sphinx
| -rw-r--r-- | .circleci/config.yml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index f4536cca5..d77cde59b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,8 @@ jobs: working_directory: ~/repo steps: - - checkout + - checkout: + - run: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge" - run: name: create virtual environment, install dependencies @@ -49,10 +50,19 @@ jobs: python tools/refguide_check.py --rst - run: + name: build devdocs w/ref warnings + command: | + . venv/bin/activate + cd doc + # Don't use -q, show warning summary" + SPHINXOPTS="-n" make -e html || echo "ignoring errors for now, see gh-13114" + + - run: name: build devdocs command: | . venv/bin/activate cd doc + make clean SPHINXOPTS=-q make -e html - run: |