From 198fa6487564e2320445894816f20a1dab19b98c Mon Sep 17 00:00:00 2001 From: Richard Henck <richard.henck@tu-berlin.de> Date: Tue, 11 Aug 2020 11:45:31 +0200 Subject: [PATCH] Introduce make file for running commands This should make commands shorter, better readable and less error prone. --- .travis.yml | 7 +++---- Makefile | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 Makefile diff --git a/.travis.yml b/.travis.yml index df48154d..8dc33dad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,11 @@ services: - docker install: - - docker-compose -f docker/docker-compose.yml pull - - travis_wait docker-compose -f docker/docker-compose.yml up -d + - make run-detached script: - sleep 200 - - docker-compose -f docker/docker-compose.yml exec testcenter-frontend ng test --watch=false + - make test-units after-script: - - docker-compose -f docker/docker-compose.yml down + - make stop diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..e47b76d3 --- /dev/null +++ b/Makefile @@ -0,0 +1,19 @@ +run: + docker-compose -f docker/docker-compose.yml up + +run-detached: + docker-compose -f docker/docker-compose.yml up -d + +stop: + docker-compose -f docker/docker-compose.yml stop + +down: + docker-compose -f docker/docker-compose.yml down + +test: run-detached test-units test-e2e stop + +test-units: + docker-compose -f docker/docker-compose.yml exec testcenter-frontend-dev ng test --watch=false + +test-e2e: + docker-compose -f docker/docker-compose.yml exec testcenter-frontend-dev ng e2e --webdriver-update=false --port 4202 -- GitLab