OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Ensure we install the master branch of the e2e tests as a default

pull/21833/head
Travis Ralston 2018-12-21 19:16:37 -07:00
parent df89d973a0
commit 310f634a0d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis-test-riot.sh
View File

@ -30,7 +30,7 @@ popd
if [ "$TRAVIS_BRANCH" = "develop" ] if [ "$TRAVIS_BRANCH" = "develop" ]
then then
# run end to end tests # 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 pushd matrix-react-end-to-end-tests
ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web
# PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh # PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh

5
scripts/fetchdep.sh
View File

@ -4,6 +4,9 @@ set -e
org="$1" org="$1"
repo="$2" repo="$2"
defbranch="$3"
[ -z "$defbranch" ] && defbranch="develop"
rm -r "$repo" || true rm -r "$repo" || true
@ -19,4 +22,4 @@ then
fi fi
echo "Checking out develop branch" 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