Merge branch 'master' of ssh://git.chefkoch.net:2222/pub/make-deploy
This commit is contained in:
		
						commit
						8517e73b35
					
				
					 1 changed files with 2 additions and 2 deletions
				
			
		
							
								
								
									
										4
									
								
								Makefile
									
										
									
									
									
								
							
							
						
						
									
										4
									
								
								Makefile
									
										
									
									
									
								
							| 
						 | 
					@ -17,7 +17,7 @@ deploy: build test upload pre-deploy pre-local pull start post-local post-deploy
 | 
				
			||||||
build:
 | 
					build:
 | 
				
			||||||
ifneq (,$(wildcard build.sh))
 | 
					ifneq (,$(wildcard build.sh))
 | 
				
			||||||
	@- echo "\n### running build script"
 | 
						@- echo "\n### running build script"
 | 
				
			||||||
	@- ./build.sh || (echo "### build failed $$?"; exit 1)
 | 
						@ ./build.sh
 | 
				
			||||||
else
 | 
					else
 | 
				
			||||||
	@- echo "\n### no build script found"
 | 
						@- echo "\n### no build script found"
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
| 
						 | 
					@ -25,7 +25,7 @@ endif
 | 
				
			||||||
test:
 | 
					test:
 | 
				
			||||||
ifneq (,$(wildcard test.sh))
 | 
					ifneq (,$(wildcard test.sh))
 | 
				
			||||||
	@- echo "\n### running test script"
 | 
						@- echo "\n### running test script"
 | 
				
			||||||
	@- ./test.sh || (echo "### test failed $$?"; exit 1)
 | 
						@ ./test.sh
 | 
				
			||||||
else
 | 
					else
 | 
				
			||||||
	@- echo "\n### no test script found"
 | 
						@- echo "\n### no test script found"
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue