Revert "Makefile: možnost deploy_test deploynout i jinou branch."
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:
		
							parent
							
								
									ba5ceb14ba
								
							
						
					
					
						commit
						52d14c667a
					
				
					 1 changed files with 1 additions and 2 deletions
				
			
		
							
								
								
									
										3
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								Makefile
									
									
									
									
									
								
							|  | @ -2,7 +2,6 @@ | |||
| PYTHON=python2.7 | ||||
| VE_VER=16.0.0 | ||||
| LOCAL_PYTHON=bin/python | ||||
| TEST_BRANCH?=test | ||||
| 
 | ||||
| all: install | ||||
| 
 | ||||
|  | @ -67,7 +66,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_BRANCH) | ||||
| 	git pull origin test | ||||
| 	git clean -f | ||||
| 	make install | ||||
| 	./manage.py migrate  | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue
	
	 MaM Web user
						MaM Web user