-
Notifications
You must be signed in to change notification settings - Fork 356
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Install node for spec:cypress - Do an app:cypress:ui:seed instead of update:ui The app:cypress:ui:seed handles compiling assets, so that would be duplicate work to run it twice.
- Loading branch information
1 parent
7e4ef4d
commit 15e87a8
Showing
2 changed files
with
7 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |