Mercurial Mercurial > ns-3-dce / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Checkout correct branch (#59)
authorMatthieu Coudron <matthieu.coudron@upmc.fr>
Wed, 09 Nov 2016 14:59:26 +0100
changeset 766 42bb38801bb1
parent 765 55d65891b13b
child 767 91b95d65af36
Checkout correct branch (#59) Previous circle.yml could request userinput ... and fails tests with a timeout. This should prevent it. Also this should work with both "master" and pull requests.
circle.yml file | annotate | diff | comparison | revisions 
--- a/circle.yml	Tue Nov 08 00:52:26 2016 +0100
+++ b/circle.yml	Wed Nov 09 14:59:26 2016 +0100
@@ -18,7 +18,7 @@
         - ../bake/bake.py download
 
         # bake installs the master branch hence DCE will be install $CIRCLE_BRANCH
-        - git pull origin $CIRCLE_BRANCH/head:
+        - git remote add local "$HOME/${CIRCLE_PROJECT_REPONAME}" && git fetch local -a && git reset --hard "local/$CIRCLE_BRANCH" :
             pwd: source/ns-3-dce
         - ../bake/bake.py build -j1 -vvv
ns-3-dce