Skip to content

Commit

Permalink
TASK: Let travis use the new makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
mstruebing committed Feb 10, 2018
1 parent 6c8880c commit 48a7fb9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Build/TravisCi/InstallScripts/IntegrationTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ cd Packages/Application/Neos.Neos.Ui

# Since all environments depend on the node dependencies, install and
# afterwards prune them to remove extranous packages from previous/cached runs.
yarn install
yarn build
make install
make build

# Deactivate the previous enabled handling of hidden files with the `mv` command.
shopt -u dotglob
2 changes: 1 addition & 1 deletion Build/TravisCi/Scripts/CodeStyle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ set -e
# This file serves as the script for the TravisCI `CodeStyle` TEST_SUITE environment.
# The script will be executed in the package working directory.
#
yarn lint && yarn lint:editorconfig
make lint && make lint-editorconfig
2 changes: 1 addition & 1 deletion Build/TravisCi/Scripts/IntegrationTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ set -e
# The script will be executed in the package working directory.
#

yarn test:e2e
make test-e2e
2 changes: 1 addition & 1 deletion Build/TravisCi/Scripts/UnitTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ set -e
#

# Execute the unit tests.
yarn test
make test

0 comments on commit 48a7fb9

Please sign in to comment.