Fix end-to-end test layering too

This commit is contained in:
Travis Ralston 2020-01-20 16:23:33 -07:00
parent 3eeeb9c6af
commit 27412ba0b2
3 changed files with 6 additions and 30 deletions

View file

@ -76,6 +76,7 @@ steps:
- docker#v3.0.1: - docker#v3.0.1:
image: "matrixdotorg/riotweb-ci-e2etests-env:latest" image: "matrixdotorg/riotweb-ci-e2etests-env:latest"
propagate-environment: true propagate-environment: true
workdir: "/workdir/matrix-react-sdk"
- label: "🔧 Riot Tests" - label: "🔧 Riot Tests"
agents: agents:

View file

@ -1,25 +0,0 @@
#!/bin/bash
#
# script which is run by the CI build (after `yarn test`).
#
# clones riot-web develop and runs the tests against our version of react-sdk.
set -ev
RIOT_WEB_DIR=riot-web
REACT_SDK_DIR=`pwd`
yarn link
scripts/fetchdep.sh vector-im riot-web
pushd "$RIOT_WEB_DIR"
yarn link matrix-js-sdk
yarn link matrix-react-sdk
yarn install
yarn build
popd

View file

@ -21,15 +21,15 @@ handle_error() {
trap 'handle_error' ERR trap 'handle_error' ERR
RIOT_WEB_DIR=riot-web
REACT_SDK_DIR=`pwd`
echo "--- Building Riot" echo "--- Building Riot"
scripts/ci/build.sh scripts/ci/layered-riot-web.sh
cd ../riot-web
yarn build
cd ../matrix-react-sdk
# run end to end tests # run end to end tests
pushd test/end-to-end-tests pushd test/end-to-end-tests
ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web ln -s ../riot-web riot/riot-web
# PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh # PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
# CHROME_PATH=$(which google-chrome-stable) ./run.sh # CHROME_PATH=$(which google-chrome-stable) ./run.sh
echo "--- Install synapse & other dependencies" echo "--- Install synapse & other dependencies"