From 251a93dc534ccaae3dffae1a48a5aa0fc3e17fd2 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 21 Dec 2018 15:56:13 -0700 Subject: [PATCH 1/3] Test the build --- temp.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 temp.txt diff --git a/temp.txt b/temp.txt new file mode 100644 index 00000000000..e69de29bb2d From 22fecc1db5363e32d8dbf40a86f5195308c3a573 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 21 Dec 2018 18:06:51 -0700 Subject: [PATCH 2/3] echo the homeserver config --- .travis-test-riot.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis-test-riot.sh b/.travis-test-riot.sh index 88b3719b3a6..681bcbae36d 100755 --- a/.travis-test-riot.sh +++ b/.travis-test-riot.sh @@ -36,6 +36,7 @@ then # PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh # CHROME_PATH=$(which google-chrome-stable) ./run.sh ./install.sh + cat installations/consent/homeserver.yaml ./run.sh --travis popd fi From b9e456b2f579dc5896a2d1b51a7ba23750ea1c60 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 21 Dec 2018 18:24:10 -0700 Subject: [PATCH 3/3] Fetch matching e2e-test branch --- .travis-test-riot.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis-test-riot.sh b/.travis-test-riot.sh index 681bcbae36d..e1eb186ea51 100755 --- a/.travis-test-riot.sh +++ b/.travis-test-riot.sh @@ -30,13 +30,12 @@ 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 # CHROME_PATH=$(which google-chrome-stable) ./run.sh ./install.sh - cat installations/consent/homeserver.yaml ./run.sh --travis popd fi