summaryrefslogtreecommitdiff
path: root/.circleci
diff options
context:
space:
mode:
authorRoss Barnowski <rossbar@berkeley.edu>2020-10-09 13:42:57 -0700
committerRoss Barnowski <rossbar@berkeley.edu>2020-10-09 13:42:57 -0700
commit7f1d6358129b38f82d638310754d51ff7db79ab4 (patch)
tree41d6d0b0259177cb10efe2afc4688c42dd4d1783 /.circleci
parent0485b2395704ba9847a87a159d49bfecbf4ba1b5 (diff)
downloadnumpy-7f1d6358129b38f82d638310754d51ff7db79ab4.tar.gz
Fix yaml parsing error.
Diffstat (limited to '.circleci')
-rw-r--r--.circleci/config.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index ca7558054..dc18757d2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,10 @@ jobs:
steps:
- checkout:
- - run: [[ ! -z $CI_PULL_REQUEST ]] && git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge"
+ - run:
+ name: pull changes from merge
+ command: |
+ [[ ! -z $CI_PULL_REQUEST ]] && git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge"
- run:
name: create virtual environment, install dependencies