From 8bde7de1ee4b6944e3f3d3024ed619ac5980be27 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Wed, 1 Nov 2017 13:22:38 +0100 Subject: [PATCH] Replace ant with Makefile Fixes #1735 Signed-off-by: Kevin Decherf --- .travis.yml | 2 +- Makefile | 36 ++++++++++---- build.xml | 136 ---------------------------------------------------- 3 files changed, 28 insertions(+), 146 deletions(-) delete mode 100644 build.xml diff --git a/.travis.yml b/.travis.yml index 6b279ed67..42fbb9661 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,7 +70,7 @@ before_install: script: - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist - - ant prepare-$DB + - make prepare DB=$DB - echo "travis_fold:start:migrations" - php bin/console doctrine:migrations:migrate --no-interaction --env=test diff --git a/Makefile b/Makefile index ffbe102a0..9e44edc6a 100755 --- a/Makefile +++ b/Makefile @@ -1,15 +1,13 @@ TMP_FOLDER=/tmp RELEASE_FOLDER=wllbg-release -ifndef ENV - ENV=prod -endif +ENV ?= prod help: ## Display this help menu @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' clean: ## Clear the application cache - @rm -rf var/cache/* + rm -rf var/cache/* install: ## Install wallabag with the latest version @sh scripts/install.sh $(ENV) @@ -26,8 +24,30 @@ run: ## Run the wallabag built-in server build: ## Run webpack @npm run build:$(ENV) -test: ## Launch wallabag testsuite - @ant prepare && bin/simple-phpunit -v +prepare: clean ## Prepare database for testsuite +ifdef DB + cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml +endif + -php bin/console doctrine:database:drop --force --env=test + php bin/console doctrine:database:create --env=test +ifndef DB ## make test does not define DB + php bin/console doctrine:schema:create --env=test +endif +ifeq ($(DB), sqlite) + php bin/console doctrine:schema:create --env=test +endif +ifeq ($(DB), mysql) + php bin/console doctrine:database:import data/sql/mysql_base.sql --env=test +endif +ifeq ($(DB), pgsql) + psql -h localhost -d wallabag_test -U travis -f data/sql/pgsql_base.sql +endif + +fixtures: ## Load fixtures into database + php bin/console doctrine:fixtures:load --no-interaction --env=test + +test: prepare fixtures ## Launch wallabag testsuite + bin/simple-phpunit -v release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`). ifndef VERSION @@ -35,11 +55,9 @@ ifndef VERSION endif @sh scripts/release.sh $(VERSION) $(TMP_FOLDER) $(RELEASE_FOLDER) $(ENV) -travis: ## Make some stuff for Travis-CI - deploy: ## Deploy wallabag @bundle exec cap staging deploy -.PHONY: help clean install update build test release travis deploy run dev +.PHONY: help clean prepare install fixtures update build test release deploy run dev .DEFAULT_GOAL := install diff --git a/build.xml b/build.xml deleted file mode 100644 index b9fe61362..000000000 --- a/build.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -