From ba5ceb14ba4a945aa39c5d9e56c9526c58e151ae Mon Sep 17 00:00:00 2001 From: LEdoian Date: Mon, 17 Sep 2018 22:18:27 +0200 Subject: [PATCH] =?UTF-8?q?Makefile:=20mo=C5=BEnost=20deploy=5Ftest=20depl?= =?UTF-8?q?oynout=20i=20jinou=20branch.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 51bbdfad..7abd5a36 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ PYTHON=python2.7 VE_VER=16.0.0 LOCAL_PYTHON=bin/python +TEST_BRANCH?=test all: install @@ -66,7 +67,7 @@ deploy_test: @if [ ${USER} != "mam-web" ]; then echo "Only possible by user mam-web"; exit 1; fi @if [ `pwd` != "/akce/mam/www/mamweb-test" ]; then echo "Only possible in /akce/mam/www/mamweb-test"; exit 1; fi @echo "Installing version from origin/test ..." - git pull origin test + git pull origin $(TEST_BRANCH) git clean -f make install ./manage.py migrate