diff --git a/Jenkinsfile b/Jenkinsfile index 2756574..ad69f31 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -101,10 +101,14 @@ pipeline { stages { stage('Prepare dependencies') { + agent { + node { label'workstation' } + } steps { sh''' git submodule update --init make clean || true + rm -rf build/* || true ''' } } diff --git a/Makefile b/Makefile index 61f2da1..b1f427c 100644 --- a/Makefile +++ b/Makefile @@ -57,13 +57,13 @@ luasocket: make -C $(ROOT_DIR)/antd/luasocket linux LUAV=5.4 \ LUAINC_linux=$(ROOT_DIR)/antd/silk/modules/lua/lua54/ \ - LUAPREFIX_linux=$(DESTDIR) \ + LUAPREFIX_linux=$(BUILD_PREFIX) \ PLAT=linux \ make -C $(ROOT_DIR)/antd/luasocket install-unix - -mkdir -p $(DESTDIR)/lib/lua - cp -rf $(DESTDIR)/lib/lua/5.4/* $(DESTDIR)/opt/www/lib/lua/ - cp -rf $(DESTDIR)/share/lua/5.4/* $(DESTDIR)/opt/www/lib/lua/ - rm -rf $(DESTDIR)/lib $(DESTDIR)/share + -mkdir -p $(INSTALL_DIR)/lib/lua + cp -rf $(INSTALL_DIR)/lib/lua/5.4/* $(INSTALL_DIR)/lib/lua/ + cp -rf $(INSTALL_DIR)/share/lua/5.4/* $(INSTALL_DIR)/lib/lua/ + rm -rf $(INSTALL_DIR)/lib/lua/5.4 $(INSTALL_DIR)/share antd-% sil%: httpd @echo "Building $@"