Merge pull request #3 from carver/circle-merge
circleci: merge (and reattempt) PR before testing
This commit is contained in:
commit
c18b0cecfc
|
@ -6,6 +6,17 @@ common: &common
|
||||||
working_directory: ~/repo
|
working_directory: ~/repo
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- 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:
|
- run:
|
||||||
name: merge pull request base
|
name: merge pull request base
|
||||||
command: |
|
command: |
|
||||||
|
@ -33,6 +44,7 @@ common: &common
|
||||||
command: ~/.local/bin/tox -r
|
command: ~/.local/bin/tox -r
|
||||||
- save_cache:
|
- save_cache:
|
||||||
paths:
|
paths:
|
||||||
|
- .hypothesis
|
||||||
- .tox
|
- .tox
|
||||||
- ~/.cache/pip
|
- ~/.cache/pip
|
||||||
- ~/.local
|
- ~/.local
|
||||||
|
|
12
.circleci/merge_pr.sh
Normal file
12
.circleci/merge_pr.sh
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
|
||||||
|
PR_INFO_URL=https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls/$CIRCLE_PR_NUMBER
|
||||||
|
PR_BASE_BRANCH=$(curl -L "$PR_INFO_URL" | python -c 'import json, sys; obj = json.load(sys.stdin); sys.stdout.write(obj["base"]["ref"])')
|
||||||
|
git fetch origin +"$PR_BASE_BRANCH":circleci/pr-base
|
||||||
|
# We need these config values or git complains when creating the
|
||||||
|
# merge commit
|
||||||
|
git config --global user.name "Circle CI"
|
||||||
|
git config --global user.email "circleci@example.com"
|
||||||
|
git merge --no-edit circleci/pr-base
|
||||||
|
fi
|
Loading…
Reference in New Issue
Block a user