mam/mamweb
11
0
Fork 0
Code Issues Pull requests 7 Projects Wiki Activity Actions

Revert "Makefile: možnost deploy_test deploynout i jinou branch."

Browse source 
Tohle stejně nefungovalo. Asi je to dobrý nápad, ale git se chová jinak, než
jsem si myslel.

This reverts commit ba5ceb14ba.
This commit is contained in:
MaM Web user 2018-09-18 02:20:55 +02:00
parent ba5ceb14ba
commit 52d14c667a
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -2,7 +2,6 @@
PYTHON=python2.7 PYTHON=python2.7
VE_VER=16.0.0 VE_VER=16.0.0
LOCAL_PYTHON=bin/python LOCAL_PYTHON=bin/python
TEST_BRANCH?=test
all: install all: install
@ -67,7 +66,7 @@ deploy_test:
@if [ ${USER} != "mam-web" ]; then echo "Only possible by user mam-web"; exit 1; fi @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 @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 ..." @echo "Installing version from origin/test ..."
git pull origin $(TEST_BRANCH) git pull origin test
git clean -f git clean -f
make install make install
./manage.py migrate ./manage.py migrate