diff options
| author | mattip <matti.picus@gmail.com> | 2020-10-07 12:55:23 +0300 |
|---|---|---|
| committer | mattip <matti.picus@gmail.com> | 2020-10-07 12:55:23 +0300 |
| commit | 2b05b8f5e82c309858ae23aceddfe15c80e43f0a (patch) | |
| tree | c51366b3895fbecce12f2b0ce40790eeca813edc | |
| parent | a7a7b6ba1833f7d5a6acd2e3cc63bfd29cc49005 (diff) | |
| download | numpy-2b05b8f5e82c309858ae23aceddfe15c80e43f0a.tar.gz | |
BLD: try merging in a separate step
| -rw-r--r-- | .circleci/config.yml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index bcebb58b8..7fd46a931 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,8 +14,7 @@ jobs: steps: - checkout: - post: - git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge" + - run: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge" - run: name: create virtual environment, install dependencies @@ -53,9 +52,13 @@ jobs: - run: name: build devdocs w/ref warnings command: | + set +e + # allow this to fail for now: issue 13114 . venv/bin/activate cd doc - SPHINXOPTS="-q -n" make -e html || echo "ignoring errors for now, see gh-13114" + SPHINXOPTS="-q -n" make -e html + # clear the error + echo ok - run: name: build devdocs |