mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-25 02:35:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Nest other layers inside on automation

Browse source 
This changes the nesting style because some CI / CD systems do not allow moving
to a directory above the checkout for the primary repo (`react-sdk` in this
case).

Part of https://github.com/vector-im/element-web/issues/12624
This commit is contained in:
J. Ryan Stinnett 2020-11-20 17:55:48 +00:00
parent a6e69db8f5
commit 883d5d96a7
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/ci/app-tests.sh
View file

@ -7,6 +7,6 @@
set -ev set -ev
scripts/ci/layered.sh scripts/ci/layered.sh
cd ../element-web cd element-web
yarn build:genfiles # so the tests can run. Faster version of `build` yarn build:genfiles # so the tests can run. Faster version of `build`
yarn test yarn test

4
scripts/ci/end-to-end-tests.sh
View file

@ -15,10 +15,10 @@ trap 'handle_error' ERR
echo "--- Building Element" echo "--- Building Element"
scripts/ci/layered.sh scripts/ci/layered.sh
cd ../element-web cd element-web
element_web_dir=`pwd` element_web_dir=`pwd`
CI_PACKAGE=true yarn build CI_PACKAGE=true yarn build
cd ../matrix-react-sdk cd ..
# run end to end tests # run end to end tests
pushd test/end-to-end-tests pushd test/end-to-end-tests
ln -s $element_web_dir element/element-web ln -s $element_web_dir element/element-web

18
scripts/ci/layered.sh
View file

@ -1,28 +1,28 @@
#!/bin/bash #!/bin/bash
# Creates an environment similar to one that element-web would expect for # Creates a layered environment with the full repo for the app and SDKs cloned
# development. This means going one directory up (and assuming we're in # and linked.
# a directory like /workdir/matrix-react-sdk) and putting element-web and
# the js-sdk there.
cd ../ # Assume we're at something like /workdir/matrix-react-sdk # Note that this style is different from the recommended developer setup: this
# file nests js-sdk and element-web inside react-sdk, while the local
# development setup places them all at the same level. We are nesting them here
# because some CI systems do not allow moving to a directory above the checkout
# for the primary repo (react-sdk in this case).
# Set up the js-sdk first # Set up the js-sdk first
matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-js-sdk scripts/fetchdep.sh matrix-org matrix-js-sdk
pushd matrix-js-sdk pushd matrix-js-sdk
yarn link yarn link
yarn install yarn install
popd popd
# Now set up the react-sdk # Now set up the react-sdk
pushd matrix-react-sdk
yarn link matrix-js-sdk yarn link matrix-js-sdk
yarn link yarn link
yarn install yarn install
popd
# Finally, set up element-web # Finally, set up element-web
matrix-react-sdk/scripts/fetchdep.sh vector-im element-web scripts/fetchdep.sh vector-im element-web
pushd element-web pushd element-web
yarn link matrix-js-sdk yarn link matrix-js-sdk
yarn link matrix-react-sdk yarn link matrix-react-sdk