From df89d973a06a68536cc414c192b6ff247f513def Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 21 Dec 2018 18:24:10 -0700 Subject: [PATCH 1/3] Fetch matching e2e-test branch --- .travis-test-riot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis-test-riot.sh b/.travis-test-riot.sh index 88b3719b3a..e1eb186ea5 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 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 From 310f634a0d24d5866b96ae387420200a0b8618a4 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 21 Dec 2018 19:16:37 -0700 Subject: [PATCH 2/3] Ensure we install the master branch of the e2e tests as a default --- .travis-test-riot.sh | 2 +- scripts/fetchdep.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis-test-riot.sh b/.travis-test-riot.sh index e1eb186ea5..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 - scripts/fetchdep.sh matrix-org matrix-react-end-to-end-tests + 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..f951c5b341 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 @@ -19,4 +22,4 @@ then fi echo "Checking out develop branch" -git clone https://github.com/$org/$repo.git $repo --branch develop +git clone https://github.com/$org/$repo.git $repo --branch $defbranch From 135a0884c92373214b3c8bcd0a82bf7e35a3556a Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 28 Dec 2018 19:42:13 -0700 Subject: [PATCH 3/3] Update scripts/fetchdep.sh Co-Authored-By: turt2live --- scripts/fetchdep.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/fetchdep.sh b/scripts/fetchdep.sh index f951c5b341..4f42859439 100755 --- a/scripts/fetchdep.sh +++ b/scripts/fetchdep.sh @@ -21,5 +21,5 @@ then git clone https://github.com/$org/$repo.git $repo --branch "$curbranch" && exit 0 fi -echo "Checking out develop branch" +echo "Checking out default branch $defbranch" git clone https://github.com/$org/$repo.git $repo --branch $defbranch