Merge remote-tracking branch 'origin/develop' into develop
						commit
						44ae73f1f5
					
				|  | @ -27,12 +27,15 @@ npm run build | |||
| npm run test | ||||
| popd | ||||
| 
 | ||||
| # run end to end tests | ||||
| git clone https://github.com/matrix-org/matrix-react-end-to-end-tests.git --branch 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 | ||||
| # CHROME_PATH=$(which google-chrome-stable) ./run.sh | ||||
| ./install.sh | ||||
| ./run.sh --travis | ||||
| popd | ||||
| if [ "$TRAVIS_BRANCH" != "experimental" ] | ||||
| then | ||||
|     # run end to end tests | ||||
|     git clone https://github.com/matrix-org/matrix-react-end-to-end-tests.git --branch 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 | ||||
|     # CHROME_PATH=$(which google-chrome-stable) ./run.sh | ||||
|     ./install.sh | ||||
|     ./run.sh --travis | ||||
|     popd | ||||
| fi | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Weblate
						Weblate