From 48a7fb9f3ef620367748efc2ff8ff158e23ff8be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20Str=C3=BCbing?= Date: Sat, 10 Feb 2018 23:00:27 +0100 Subject: [PATCH] TASK: Let travis use the new makefile --- Build/TravisCi/InstallScripts/IntegrationTests.sh | 4 ++-- Build/TravisCi/Scripts/CodeStyle.sh | 2 +- Build/TravisCi/Scripts/IntegrationTests.sh | 2 +- Build/TravisCi/Scripts/UnitTests.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Build/TravisCi/InstallScripts/IntegrationTests.sh b/Build/TravisCi/InstallScripts/IntegrationTests.sh index 4a4e25c2e5..cc2e90aec1 100644 --- a/Build/TravisCi/InstallScripts/IntegrationTests.sh +++ b/Build/TravisCi/InstallScripts/IntegrationTests.sh @@ -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 diff --git a/Build/TravisCi/Scripts/CodeStyle.sh b/Build/TravisCi/Scripts/CodeStyle.sh index 10ead47920..4a14f27d15 100644 --- a/Build/TravisCi/Scripts/CodeStyle.sh +++ b/Build/TravisCi/Scripts/CodeStyle.sh @@ -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 diff --git a/Build/TravisCi/Scripts/IntegrationTests.sh b/Build/TravisCi/Scripts/IntegrationTests.sh index 2ecfeb6aa6..05d9eb6981 100644 --- a/Build/TravisCi/Scripts/IntegrationTests.sh +++ b/Build/TravisCi/Scripts/IntegrationTests.sh @@ -7,4 +7,4 @@ set -e # The script will be executed in the package working directory. # -yarn test:e2e +make test-e2e diff --git a/Build/TravisCi/Scripts/UnitTests.sh b/Build/TravisCi/Scripts/UnitTests.sh index 6ab57f148d..ad39152ee1 100644 --- a/Build/TravisCi/Scripts/UnitTests.sh +++ b/Build/TravisCi/Scripts/UnitTests.sh @@ -13,4 +13,4 @@ set -e # # Execute the unit tests. -yarn test +make test