diff options
| author | Sebastian Berg <sebastian@sipsolutions.net> | 2020-10-13 18:43:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-13 18:43:33 -0500 |
| commit | 8eb6424128b4be16bab4115f9d172b32c397972d (patch) | |
| tree | 96c14aa38b9daef31f930395ed5da360595550ef | |
| parent | dbc4f5d3fff330a842576427674ee4fc5de0164d (diff) | |
| parent | b6d95828dfc61d7530c39c958e4a1e9c8d884393 (diff) | |
| download | numpy-8eb6424128b4be16bab4115f9d172b32c397972d.tar.gz | |
Merge pull request #17541 from rossbar/circleci_envvar_fix
CI: fix conditional for PR merge command
| -rw-r--r-- | .circleci/config.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index dc18757d2..9324de943 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,7 @@ jobs: - run: name: pull changes from merge command: | - [[ ! -z $CI_PULL_REQUEST ]] && git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge" + if [[ -v CI_PULL_REQUEST ]] ; then git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge" ; fi - run: name: create virtual environment, install dependencies |