mirror of
				https://github.com/vector-im/element-web.git
				synced 2025-11-04 10:11:03 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
		
						commit
						44ae73f1f5
					
				@ -27,12 +27,15 @@ npm run build
 | 
				
			|||||||
npm run test
 | 
					npm run test
 | 
				
			||||||
popd
 | 
					popd
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# run end to end tests
 | 
					if [ "$TRAVIS_BRANCH" != "experimental" ]
 | 
				
			||||||
git clone https://github.com/matrix-org/matrix-react-end-to-end-tests.git --branch master
 | 
					then
 | 
				
			||||||
pushd matrix-react-end-to-end-tests
 | 
					    # run end to end tests
 | 
				
			||||||
ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web
 | 
					    git clone https://github.com/matrix-org/matrix-react-end-to-end-tests.git --branch master
 | 
				
			||||||
# PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
 | 
					    pushd matrix-react-end-to-end-tests
 | 
				
			||||||
# CHROME_PATH=$(which google-chrome-stable) ./run.sh
 | 
					    ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web
 | 
				
			||||||
./install.sh
 | 
					    # PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
 | 
				
			||||||
./run.sh --travis
 | 
					    # CHROME_PATH=$(which google-chrome-stable) ./run.sh
 | 
				
			||||||
popd
 | 
					    ./install.sh
 | 
				
			||||||
 | 
					    ./run.sh --travis
 | 
				
			||||||
 | 
					    popd
 | 
				
			||||||
 | 
					fi
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user