diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2020-10-09 16:03:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-09 16:03:20 -0600 |
| commit | 60e1319323a01a7af98ec7b322c381eaceb7cc61 (patch) | |
| tree | 41d6d0b0259177cb10efe2afc4688c42dd4d1783 | |
| parent | 156cd054e007b05d4ac4829e10a369d19dd2b0b1 (diff) | |
| parent | 7f1d6358129b38f82d638310754d51ff7db79ab4 (diff) | |
| download | numpy-60e1319323a01a7af98ec7b322c381eaceb7cc61.tar.gz | |
Merge pull request #17525 from rossbar/circleci_envvar_fix
CI: Make merge ref grabbing conditional on the PR being active
| -rw-r--r-- | .circleci/config.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index d77cde59b..dc18757d2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,10 @@ jobs: steps: - checkout: - - run: 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 |