diff --git a/tools/ci/before_install.sh b/tools/ci/before_install.sh index a5c7c6dca146..8d2f89c8fc4b 100644 --- a/tools/ci/before_install.sh +++ b/tools/ci/before_install.sh @@ -1,4 +1,4 @@ # not spec, and not cross repo -if [ "$TEST_SUITE" = "spec:javascript" -o "$TEST_SUITE" = "spec:jest" -o "$TEST_SUITE" = "spec:compile" ]; then +if [ "$TEST_SUITE" = "spec:javascript" -o "$TEST_SUITE" = "spec:jest" -o "$TEST_SUITE" = "spec:compile" -o "$TEST_SUITE" = "spec:cypress" ]; then nvm install 12 fi diff --git a/tools/ci/before_script.sh b/tools/ci/before_script.sh index 7fb1ed2d92fc..46625b84bece 100644 --- a/tools/ci/before_script.sh +++ b/tools/ci/before_script.sh @@ -1,8 +1,13 @@ # not spec, and not cross repo -if [ "$TEST_SUITE" = "spec:javascript" -o "$TEST_SUITE" = "spec:jest" -o "$TEST_SUITE" = "spec:compile" ]; then +if [ "$TEST_SUITE" = "spec:javascript" -o "$TEST_SUITE" = "spec:jest" -o "$TEST_SUITE" = "spec:compile" -o "$TEST_SUITE" = "spec:cypress" ]; then # make sure yarn is installed, in the right version bundle exec rake webpacker:check_yarn || npm install -g yarn # install & compile dependencies bundle exec rake update:ui + + if [ "$TEST_SUITE" = "spec:cypress" ]; then + # run evm:compile_assets (and friends) if cypress + bundle exec rake app:cypress:ui:seed + fi fi