From 414c7e956bcc1e1d3b5f71b93c9ba053639b733b Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Thu, 22 Jun 2017 14:55:33 -0700 Subject: [PATCH] ci: test merge commits on circle We expect this behavior because it's what Travis does. Also it's better because we want to test what happens if we merge the PR, not the status of the PR branch. --- .circleci/config.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cfd1edaff6..1f661fae0e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,11 @@ jobs: docker: - image: angular/ngcontainer steps: - - checkout + - checkout: + # After checkout, rebase on top of master. + # Similar to travis behavior, but not quite the same. + # See https://discuss.circleci.com/t/1662 + post: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge" - restore_cache: key: angular-{{ .Branch }}-{{ checksum "npm-shrinkwrap.json" }} - run: npm install