Remove unnecessary merge from multiple build servers
This commit is contained in:
parent
24a343f288
commit
3895dbc9d8
|
@ -69,7 +69,6 @@ $(DLL_AMD64):$(version_file)
|
||||||
native: $(DLL_WIN) $(DLL_WIN64) $(DLL_MAC) $(DLL_TIGER_MAC) $(DLL_LINUX) $(DLL_AMD64)
|
native: $(DLL_WIN) $(DLL_WIN64) $(DLL_MAC) $(DLL_TIGER_MAC) $(DLL_LINUX) $(DLL_AMD64)
|
||||||
|
|
||||||
compile: native
|
compile: native
|
||||||
cp -r $(DLL_DIR)/ $(RESOURCE_DIR)/native/
|
|
||||||
|
|
||||||
test:
|
test:
|
||||||
ssh $(WIN64_SERVER) "source .zprofile && cd $(WORK) && $(TEST_CMD)"
|
ssh $(WIN64_SERVER) "source .zprofile && cd $(WORK) && $(TEST_CMD)"
|
||||||
|
|
Loading…
Reference in New Issue