circleci: merge (and reattempt) PR before testing

2026-02-12 16:10:57 +00:00 · 2018-05-15 11:52:40 -07:00
parent 1f89c6385a
commit 8815766abf
2 changed files with 24 additions and 0 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -6,6 +6,17 @@ common: &common
  working_directory: ~/repo
  steps:
    - checkout
+    - run:
+        name: merge pull request base
+        command: ./.circleci/merge_pr.sh
+    - run:
+        name: merge pull request base (2nd try)
+        command: ./.circleci/merge_pr.sh
+        when: on_fail
+    - run:
+        name: merge pull request base (3nd try)
+        command: ./.circleci/merge_pr.sh
+        when: on_fail
    - run:
        name: merge pull request base
        command: |
@ -33,6 +44,7 @@ common: &common
        command: ~/.local/bin/tox -r
    - save_cache:
        paths:
+          - .hypothesis
          - .tox
          - ~/.cache/pip
          - ~/.local