Skip to content

Commit 5844544

Browse files
authored
Merge pull request #459 from bridadan/unique-branch-circle
Fixing git issues with CircleCI
2 parents 3c6fd5d + d30aa04 commit 5844544

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

circle.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
checkout:
2+
post:
3+
- git fetch origin master
4+
- git checkout origin/master
5+
- git merge ${CIRCLE_SHA1}
6+
17
test:
28
override:
39
- cd ../testproject && mbed compile -m K64F -t GCC_ARM --source=. --source=mbed-os/TESTS/integration/basic
@@ -7,10 +13,6 @@ test:
713

814
dependencies:
915
pre:
10-
- git fetch origin master
11-
- git checkout -b pr-branch
12-
- git checkout origin/master
13-
- git merge pr-branch --no-commit
1416
- cd ../ && ls
1517
- cd ../ && git clone https://github.com/ARMmbed/mbed-cli.git
1618
- cd ../mbed-cli && sudo pip install -e .

0 commit comments

Comments
 (0)