summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2022-04-16 20:23:41 +0800
committerruki <[email protected]>2022-04-16 20:23:41 +0800
commit838e53f354b121da72c3fc51efd1e44f876adfa1 (patch)
tree0e8b3fd1e849c1b740d913c96244c27617232712
parent6783199ea8e0e8dbf356c9401530214309932c94 (diff)
improve archive
-rw-r--r--xmake/modules/private/service/remote_build/client.lua7
-rw-r--r--xmake/modules/utils/archive/archive.lua2
2 files changed, 6 insertions, 3 deletions
diff --git a/xmake/modules/private/service/remote_build/client.lua b/xmake/modules/private/service/remote_build/client.lua
index 78b6ff683..3b887b5aa 100644
--- a/xmake/modules/private/service/remote_build/client.lua
+++ b/xmake/modules/private/service/remote_build/client.lua
@@ -401,8 +401,11 @@ function remote_build_client:_archive_diff_files(diff_files)
for _, fileitem in ipairs(diff_files.modified) do
table.insert(filelist, fileitem)
end
- archive_files(archivefile, filelist, {curdir = self:projectdir()})
- vprint("archive file ok, size: %s", os.filesize(archivefile))
+ local ok = archive_files(archivefile, filelist, {curdir = self:projectdir()})
+ if not ok then
+ return nil, "archive fileds failed!"
+ end
+ vprint("archive files ok, size: %s", os.filesize(archivefile))
return archivefile
end
diff --git a/xmake/modules/utils/archive/archive.lua b/xmake/modules/utils/archive/archive.lua
index 3c1780ba7..720a93a2f 100644
--- a/xmake/modules/utils/archive/archive.lua
+++ b/xmake/modules/utils/archive/archive.lua
@@ -319,7 +319,7 @@ function main(archivefile, inputfiles, opt)
-- init archivers
local archivers = {
- [".zip"] = {_archive_using_zip}
+ [".zip"] = {_archive_using_7z, _archive_using_7z}
, [".7z"] = {_archive_using_7z}
, [".xz"] = {_archive_using_xz}
, [".gz"] = {_archive_using_gzip}