From f9e6d2c408fc82af595ef1862872ec09c0d13997 Mon Sep 17 00:00:00 2001 From: cyjseagull Date: Tue, 10 Dec 2024 23:33:13 +0800 Subject: [PATCH 1/2] try to fix ci --- .github/workflows/cpp_full_node_workflow.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cpp_full_node_workflow.yml b/.github/workflows/cpp_full_node_workflow.yml index 8acd0d1..a2c6386 100644 --- a/.github/workflows/cpp_full_node_workflow.yml +++ b/.github/workflows/cpp_full_node_workflow.yml @@ -72,21 +72,17 @@ jobs: echo "Disk usage before delete files: "`df -lh` du -sch ${{ env.VCPKG_ROOT }}/buildtrees/* du -sch ${{ env.VCPKG_ROOT }}/buildtrees/grpc/src/* - rm -rf ${{ env.VCPKG_ROOT }}/buildtrees/grpc/src - rm -rf ${{ env.VCPKG_ROOT }}/buildtrees/grpc/*-dbg - rm -rf ${{ env.VCPKG_ROOT }}/buildtrees/krb5/src - rm -rf ${{ env.VCPKG_ROOT }}/buildtrees/gsasl/src - rm -rf ${{ env.VCPKG_ROOT }}/buildtrees/protobuf/src - rm -rf ${{ env.VCPKG_ROOT }}/buildtrees/wedprcrypto/src - rm -rf ${{ env.VCPKG_ROOT }}buildtrees/openssl/src + rm -rf ${{ env.VCPKG_ROOT }}/buildtrees/*/src rm -rf ${{ env.VCPKG_ROOT }}/buildtrees/*/*-dbg + rm -rf ${{ env.VCPKG_ROOT }}/buildtrees/*/*-rel echo "Disk usage after delete files: "`df -lh` make -j3 - name: Build for macOS if: runner.os == 'macOS' run: | bash -x cpp/tools/install_depends.sh -o macos - brew install libiconv m4 automake autoconf libtool + brew install libiconv + brew reinstall m4 autoconf libtool automake echo "## m4:"`which m4` export DYLD_LIBRARY_PATH=/usr/local/opt/libiconv/lib:${DYLD_LIBRARY_PATH} export LDFLAGS="-L/usr/local/opt/libiconv/lib" From e41278a27aebf3b81b4af300c3790f73500a5835 Mon Sep 17 00:00:00 2001 From: cyjseagull Date: Tue, 10 Dec 2024 23:39:58 +0800 Subject: [PATCH 2/2] update wedpr-mpc-service base image --- docker-files/cpp/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-files/cpp/Dockerfile b/docker-files/cpp/Dockerfile index 192445c..03f5ca6 100644 --- a/docker-files/cpp/Dockerfile +++ b/docker-files/cpp/Dockerfile @@ -63,7 +63,7 @@ COPY --from=builder /WeDPR-Component/cpp/build/bin/ppc-pro-node /data/home/wedpr ENTRYPOINT ["/data/home/wedpr/wedpr-pro-node-service/ppc-pro-node", "-c", "config.ini"] -FROM ubuntu:22.04 as wedpr-mpc-service +FROM fiscoorg:wedpr-mpc-base-ubuntu:v3.0.0 as wedpr-mpc-service LABEL maintainer=service@webank.com RUN apt-get -q update && apt-get install -qy --no-install-recommends vim libkrb5-dev krb5-user \