From ef5c9d35d1fb52132ead6dd3e570c2e39f8b653c Mon Sep 17 00:00:00 2001 From: sisong Date: Wed, 25 Dec 2024 17:02:24 +0800 Subject: [PATCH] CI: fix make & ndk; --- .github/workflows/ci.yml | 11 ++++++----- .../HDiff/private_diff/limit_mem_diff/bloom_filter.h | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a932a27..80a848ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,8 +28,8 @@ jobs: - name: make_zlibByCode run: | git clone --depth=1 https://github.com/sisong/zlib.git ../zlib - make ZLIB=1 -j - make ZLIB=1 clean + make ZLIB=1 BZIP2=1 -j + make ZLIB=1 BZIP2=1 clean - name: make_releaseByStatic run: | make ZLIB=1 BZIP2=1 MINS=1 STATIC_CPP=1 STATIC_C=1 -j @@ -41,11 +41,11 @@ jobs: - name: installClang run: | sudo apt-get install -y llvm clang - - name: make_slef + - name: make_slefByClang run: | - make BSD=0 BZIP2=0 LDEF=0 LZMA=0 ZSTD=0 MD5=0 -j + make BSD=0 BZIP2=0 LDEF=0 LZMA=0 ZSTD=0 MD5=0 CL=1 -j make clean - - name: make_byClang + - name: make_allByClang run: | git clone --depth=1 https://github.com/sisong/libmd5.git ../libmd5 git clone --depth=1 https://github.com/sisong/lzma.git ../lzma @@ -109,6 +109,7 @@ jobs: ndk-version: r16b - name: buildByAndroidNDK run: | + sudo apt-get -y install libncurses5 git clone --depth=1 https://github.com/sisong/lzma.git ../lzma git clone --depth=1 https://github.com/sisong/bzip2.git ../bzip2 git clone --depth=1 https://github.com/sisong/zstd.git ../zstd diff --git a/libHDiffPatch/HDiff/private_diff/limit_mem_diff/bloom_filter.h b/libHDiffPatch/HDiff/private_diff/limit_mem_diff/bloom_filter.h index c700f94c..487b781a 100644 --- a/libHDiffPatch/HDiff/private_diff/limit_mem_diff/bloom_filter.h +++ b/libHDiffPatch/HDiff/private_diff/limit_mem_diff/bloom_filter.h @@ -30,6 +30,7 @@ #define bloom_filter_h #include //memset #include +#include //uint32_t #include //std::runtime_error #include "../../../../libParallel/parallel_channel.h" #if (_IS_USED_MULTITHREAD)