From d8507addbb2e222462f814718cb61d3eaf2c65e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 9 Oct 2016 20:21:02 +0200 Subject: First draft for Makefile --- Makefile | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100755 Makefile (limited to 'Makefile') diff --git a/Makefile b/Makefile new file mode 100755 index 00000000..0abd5c5d --- /dev/null +++ b/Makefile @@ -0,0 +1,47 @@ +TMP_FOLDER=/tmp +RELEASE_FOLDER=wllbg-release + +SSH_USER=framasoft_bag +SSH_HOST=78.46.248.87 +SSH_PATH=/var/www/framabag.org/web + +help: + @echo 'Makefile for wallabag ' + @echo ' ' + @echo 'Usage: ' + @echo ' make install install latest stable wallabag version ' + @echo ' make update update to the latest stable wallabag version' + @echo ' make build run grunt ' + @echo ' make test execute wallabag testsuite ' + @echo ' make release produce a wallabag release ' + @echo ' make travis make things for travis ' + @echo ' ' + +install: + TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) + @git checkout $(TAG) + SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist + php bin/console wallabag:install --env=prod + +update: + +build: + grunt + +test: + ant prepare && phpunit -v + +release: + version=$(VERSION) + rm -rf $(TMP_FOLDER)/$(RELEASE_FOLDER) + mkdir $(TMP_FOLDER)/$(RELEASE_FOLDER) + @git clone git@github.com:wallabag/wallabag.git -b $(VERSION) $(TMP_FOLDER)/$(RELEASE_FOLDER)/$(VERSION) + cd $(TMP_FOLDER)/$(RELEASE_FOLDER)/$(VERSION) && SYMFONY_ENV=prod composer up -n --no-dev + cd $(TMP_FOLDER)/$(RELEASE_FOLDER)/$(VERSION) && php bin/console wallabag:install --env=prod + cd $(TMP_FOLDER)/$(RELEASE_FOLDER) && tar czf wallabag-$(VERSION).tar.gz --exclude="var/cache/*" --exclude="var/logs/*" --exclude="var/sessions/*" --exclude=".git" $(VERSION) + @echo "MD5 checksum of the package for wallabag $(VERSION)" + @md5 $(TMP_FOLDER)/$(RELEASE_FOLDER)/wallabag-$(VERSION).tar.gz + scp $(TMP_FOLDER)/$(RELEASE_FOLDER)/wallabag-$(VERSION).tar.gz $(SSH_USER)@$(SSH_HOST):$(SSH_PATH) + rm -rf $(TMP_FOLDER)/$(RELEASE_FOLDER) + +travis: -- cgit v1.2.3 From 46aeaab8ff62f8db79412932e42626a274e7a87f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 9 Oct 2016 21:06:26 +0200 Subject: Update Makefile --- Makefile | 45 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0abd5c5d..9a469a93 100755 --- a/Makefile +++ b/Makefile @@ -5,43 +5,66 @@ SSH_USER=framasoft_bag SSH_HOST=78.46.248.87 SSH_PATH=/var/www/framabag.org/web +ENV=prod + help: @echo 'Makefile for wallabag ' @echo ' ' @echo 'Usage: ' + @echo ' make clean clear cache folder ' @echo ' make install install latest stable wallabag version ' @echo ' make update update to the latest stable wallabag version' + @echo ' make run run the wallabag server ' @echo ' make build run grunt ' @echo ' make test execute wallabag testsuite ' @echo ' make release produce a wallabag release ' @echo ' make travis make things for travis ' + @echo ' make deploy deploy wallabag ' @echo ' ' +clean: + @rm -rf var/cache/* + install: TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) @git checkout $(TAG) - SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist - php bin/console wallabag:install --env=prod + @SYMFONY_ENV=$(ENV) composer install --no-dev -o --prefer-dist + @php bin/console wallabag:install --env=$(ENV) update: + @rm -rf var/cache/* + @git fetch origin + @git fetch --tags + TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) + @git checkout $(TAG) + @SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist + @php bin/console cache:clear --env=prod + +run: + php bin/console server:run --env=$(ENV) build: - grunt + @grunt test: - ant prepare && phpunit -v + @ant prepare && phpunit -v release: version=$(VERSION) - rm -rf $(TMP_FOLDER)/$(RELEASE_FOLDER) - mkdir $(TMP_FOLDER)/$(RELEASE_FOLDER) + @rm -rf $(TMP_FOLDER)/$(RELEASE_FOLDER) + @mkdir $(TMP_FOLDER)/$(RELEASE_FOLDER) @git clone git@github.com:wallabag/wallabag.git -b $(VERSION) $(TMP_FOLDER)/$(RELEASE_FOLDER)/$(VERSION) - cd $(TMP_FOLDER)/$(RELEASE_FOLDER)/$(VERSION) && SYMFONY_ENV=prod composer up -n --no-dev - cd $(TMP_FOLDER)/$(RELEASE_FOLDER)/$(VERSION) && php bin/console wallabag:install --env=prod - cd $(TMP_FOLDER)/$(RELEASE_FOLDER) && tar czf wallabag-$(VERSION).tar.gz --exclude="var/cache/*" --exclude="var/logs/*" --exclude="var/sessions/*" --exclude=".git" $(VERSION) + @cd $(TMP_FOLDER)/$(RELEASE_FOLDER)/$(VERSION) && SYMFONY_ENV=$(ENV) composer up -n --no-dev + @cd $(TMP_FOLDER)/$(RELEASE_FOLDER)/$(VERSION) && php bin/console wallabag:install --env=$(ENV) + @cd $(TMP_FOLDER)/$(RELEASE_FOLDER) && tar czf wallabag-$(VERSION).tar.gz --exclude="var/cache/*" --exclude="var/logs/*" --exclude="var/sessions/*" --exclude=".git" $(VERSION) @echo "MD5 checksum of the package for wallabag $(VERSION)" @md5 $(TMP_FOLDER)/$(RELEASE_FOLDER)/wallabag-$(VERSION).tar.gz - scp $(TMP_FOLDER)/$(RELEASE_FOLDER)/wallabag-$(VERSION).tar.gz $(SSH_USER)@$(SSH_HOST):$(SSH_PATH) - rm -rf $(TMP_FOLDER)/$(RELEASE_FOLDER) + @scp $(TMP_FOLDER)/$(RELEASE_FOLDER)/wallabag-$(VERSION).tar.gz $(SSH_USER)@$(SSH_HOST):$(SSH_PATH) + @rm -rf $(TMP_FOLDER)/$(RELEASE_FOLDER) travis: + +deploy: + @bundle exec cap staging deploy + +.PHONY: help clean install update build test release travis deploy -- cgit v1.2.3 From 26490a8794e762a77bb0439790db641a222fb0ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 9 Oct 2016 21:15:57 +0200 Subject: Update Makefile --- Makefile | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9a469a93..a4a06e3f 100755 --- a/Makefile +++ b/Makefile @@ -7,31 +7,19 @@ SSH_PATH=/var/www/framabag.org/web ENV=prod -help: - @echo 'Makefile for wallabag ' - @echo ' ' - @echo 'Usage: ' - @echo ' make clean clear cache folder ' - @echo ' make install install latest stable wallabag version ' - @echo ' make update update to the latest stable wallabag version' - @echo ' make run run the wallabag server ' - @echo ' make build run grunt ' - @echo ' make test execute wallabag testsuite ' - @echo ' make release produce a wallabag release ' - @echo ' make travis make things for travis ' - @echo ' make deploy deploy wallabag ' - @echo ' ' +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: +clean: ## Clear the application cache @rm -rf var/cache/* -install: +install: ## Install wallabag with the latest version TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) @git checkout $(TAG) @SYMFONY_ENV=$(ENV) composer install --no-dev -o --prefer-dist @php bin/console wallabag:install --env=$(ENV) -update: +update: ## Update the wallabag installation to the latest version @rm -rf var/cache/* @git fetch origin @git fetch --tags @@ -40,16 +28,19 @@ update: @SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist @php bin/console cache:clear --env=prod -run: +run: ## Run the wallabag server php bin/console server:run --env=$(ENV) -build: +build: ## Run grunt @grunt -test: +test: ## Launch wallabag testsuite @ant prepare && phpunit -v -release: +release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`). +ifndef VERSION + $(error VERSION is not set) +endif version=$(VERSION) @rm -rf $(TMP_FOLDER)/$(RELEASE_FOLDER) @mkdir $(TMP_FOLDER)/$(RELEASE_FOLDER) @@ -62,9 +53,9 @@ release: @scp $(TMP_FOLDER)/$(RELEASE_FOLDER)/wallabag-$(VERSION).tar.gz $(SSH_USER)@$(SSH_HOST):$(SSH_PATH) @rm -rf $(TMP_FOLDER)/$(RELEASE_FOLDER) -travis: +travis: ## Make some stuff for Travis-CI -deploy: +deploy: ## Deploy wallabag @bundle exec cap staging deploy .PHONY: help clean install update build test release travis deploy -- cgit v1.2.3 From 4e7863c6aa0010c22e471a84859217e1ca8227b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 9 Oct 2016 21:50:15 +0200 Subject: Created scripts folder to store update/install/release process --- Makefile | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a4a06e3f..f7f6138d 100755 --- a/Makefile +++ b/Makefile @@ -1,10 +1,6 @@ TMP_FOLDER=/tmp RELEASE_FOLDER=wllbg-release -SSH_USER=framasoft_bag -SSH_HOST=78.46.248.87 -SSH_PATH=/var/www/framabag.org/web - ENV=prod help: ## Display this help menu @@ -14,19 +10,10 @@ clean: ## Clear the application cache @rm -rf var/cache/* install: ## Install wallabag with the latest version - TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) - @git checkout $(TAG) - @SYMFONY_ENV=$(ENV) composer install --no-dev -o --prefer-dist - @php bin/console wallabag:install --env=$(ENV) + @sh scripts/install.sh $(ENV) update: ## Update the wallabag installation to the latest version - @rm -rf var/cache/* - @git fetch origin - @git fetch --tags - TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) - @git checkout $(TAG) - @SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist - @php bin/console cache:clear --env=prod + @sh scripts/update.sh $(ENV) run: ## Run the wallabag server php bin/console server:run --env=$(ENV) @@ -41,17 +28,7 @@ release: ## Create a package. Need a VERSION parameter (eg: `make release VERSIO ifndef VERSION $(error VERSION is not set) endif - version=$(VERSION) - @rm -rf $(TMP_FOLDER)/$(RELEASE_FOLDER) - @mkdir $(TMP_FOLDER)/$(RELEASE_FOLDER) - @git clone git@github.com:wallabag/wallabag.git -b $(VERSION) $(TMP_FOLDER)/$(RELEASE_FOLDER)/$(VERSION) - @cd $(TMP_FOLDER)/$(RELEASE_FOLDER)/$(VERSION) && SYMFONY_ENV=$(ENV) composer up -n --no-dev - @cd $(TMP_FOLDER)/$(RELEASE_FOLDER)/$(VERSION) && php bin/console wallabag:install --env=$(ENV) - @cd $(TMP_FOLDER)/$(RELEASE_FOLDER) && tar czf wallabag-$(VERSION).tar.gz --exclude="var/cache/*" --exclude="var/logs/*" --exclude="var/sessions/*" --exclude=".git" $(VERSION) - @echo "MD5 checksum of the package for wallabag $(VERSION)" - @md5 $(TMP_FOLDER)/$(RELEASE_FOLDER)/wallabag-$(VERSION).tar.gz - @scp $(TMP_FOLDER)/$(RELEASE_FOLDER)/wallabag-$(VERSION).tar.gz $(SSH_USER)@$(SSH_HOST):$(SSH_PATH) - @rm -rf $(TMP_FOLDER)/$(RELEASE_FOLDER) + @sh scripts/release.sh $(VERSION) $(TMP_FOLDER) $(RELEASE_FOLDER) $(ENV) travis: ## Make some stuff for Travis-CI -- cgit v1.2.3 From 02edf0707f2f61b86b4640a16c3f2eede7d36ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 9 Oct 2016 22:01:24 +0200 Subject: Changed the default command when we launch make --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f7f6138d..2a749718 100755 --- a/Makefile +++ b/Makefile @@ -36,3 +36,5 @@ deploy: ## Deploy wallabag @bundle exec cap staging deploy .PHONY: help clean install update build test release travis deploy + +.DEFAULT_GOAL := install -- cgit v1.2.3 From 84e3c36e02e4ffb4611f6e1eca37c97a0ffb4660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 10 Oct 2016 09:15:53 +0200 Subject: Added documentation about testsuite Fix #2415 --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2a749718..e99367f6 100755 --- a/Makefile +++ b/Makefile @@ -1,7 +1,9 @@ TMP_FOLDER=/tmp RELEASE_FOLDER=wllbg-release -ENV=prod +ifndef ENV + ENV=prod +endif 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}' @@ -15,14 +17,14 @@ install: ## Install wallabag with the latest version update: ## Update the wallabag installation to the latest version @sh scripts/update.sh $(ENV) -run: ## Run the wallabag server - php bin/console server:run --env=$(ENV) +run: ## Run the wallabag built-in server + @php bin/console server:run --env=$(ENV) build: ## Run grunt @grunt test: ## Launch wallabag testsuite - @ant prepare && phpunit -v + @ant prepare && vendor/phpunit/phpunit/phpunit -v release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`). ifndef VERSION -- cgit v1.2.3 From 7c1225347db8b516cc268709939f6b359bc283c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 10 Oct 2016 10:20:32 +0200 Subject: Update documentation --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e99367f6..1c6c0d53 100755 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ build: ## Run grunt @grunt test: ## Launch wallabag testsuite + @if [ ! -d "vendor/phpunit" ]; then composer install; fi @ant prepare && vendor/phpunit/phpunit/phpunit -v release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`). -- cgit v1.2.3