diff --git a/.travis-test-riot.sh b/.travis-test-riot.sh index 88b3719b3a..d1c2804b2a 100755 --- a/.travis-test-riot.sh +++ b/.travis-test-riot.sh @@ -30,7 +30,7 @@ popd if [ "$TRAVIS_BRANCH" = "develop" ] then # run end to end tests - git clone https://github.com/matrix-org/matrix-react-end-to-end-tests.git --branch master + scripts/fetchdep.sh matrix-org matrix-react-end-to-end-tests master pushd matrix-react-end-to-end-tests ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web # PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh diff --git a/scripts/fetchdep.sh b/scripts/fetchdep.sh index 73c622133b..4f42859439 100755 --- a/scripts/fetchdep.sh +++ b/scripts/fetchdep.sh @@ -4,6 +4,9 @@ set -e org="$1" repo="$2" +defbranch="$3" + +[ -z "$defbranch" ] && defbranch="develop" rm -r "$repo" || true @@ -18,5 +21,5 @@ then git clone https://github.com/$org/$repo.git $repo --branch "$curbranch" && exit 0 fi -echo "Checking out develop branch" -git clone https://github.com/$org/$repo.git $repo --branch develop +echo "Checking out default branch $defbranch" +git clone https://github.com/$org/$repo.git $repo --branch $defbranch