upgrade uplad-artifact

WeBankBlockchain · Sep 14, 2024 · 5692185 · 5692185
1 parent 3b3a6c3
commit 5692185
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/cpp_workflow.yml b/.github/workflows/cpp_workflow.yml
@@ -129,6 +129,7 @@ jobs:
       - name: Build for macos
         if: runner.os == 'macOS'
         run: |
+          brew install lcov
           bash cpp/tools/install_depends.sh -o macos
           mkdir -p cpp/build && cd cpp/build && cmake -DTESTS=ON -DCOVERAGE=ON -DBUILD_SDK=ON -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake ../
           make -j3
@@ -137,12 +138,12 @@ jobs:
         run: |
           cd cpp/build && CTEST_OUTPUT_ON_FAILURE=TRUE make test
           make coverage
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: runner.os == 'macos'
         with:
           name: libppc-crypto-sdk-jni.dylib
           path: ./cpp/wedpr-component-sdk/bindings/java/src/main/resources/META-INF/native/libppc-crypto-sdk-jni.dylib
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: runner.os == 'Windows'
         with:
           name: libppc-crypto-sdk-jni.dylib
@@ -206,19 +207,19 @@ jobs:
         run: |
           export OMP_NUM_THREADS=1
           cd build && CTEST_OUTPUT_ON_FAILURE=TRUE make test
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ppc-air-node-centos-x64
           path: ./cpp/build/bin/ppc-air-node
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ppc-pro-node-centos-x64
           path: ./cpp/build/bin/ppc-pro-node
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ppc-gateway-service-centos-x64
           path: ./cpp/build/bin/ppc-gateway-service
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: libppc-crypto-sdk-jni.so
-          path: ./cpp/wedpr-component-sdk/bindings/java/src/main/resources/META-INF/native/libppc-crypto-sdk-jni.so
+          path: ./cpp/wedpr-component-sdk/bindings/java/src/main/resources/META-INF/native/libppc-crypto-sdk-jni.so
diff --git a/cpp/tools/install_depends.sh b/cpp/tools/install_depends.sh
@@ -67,7 +67,7 @@ install_centos_depends()
 {
     LOG_INFO "install depends for centos ..."
     # install the basic package
-    sudo yum install -y bison flex epel-release centos-release-scl flex bison patch devtoolset-11 rh-perl530-perl cmake3 zlib-devel ccache lcov python-devel python3-devel krb5-devel autoconf
+    sudo yum install -y lcov bison flex epel-release centos-release-scl flex bison patch devtoolset-11 rh-perl530-perl cmake3 zlib-devel ccache lcov python-devel python3-devel krb5-devel autoconf
     LOG_INFO "install basic-package-depends for centos success..."
 
     LOG_INFO "install gsasl ... "
@@ -85,7 +85,7 @@ install_ubuntu_depends()
 {
     LOG_INFO "install depends for ubuntu ..."
     # install the basic package
-    sudo apt install -y bison flex g++ libssl-dev openssl cmake git build-essential autoconf texinfo flex patch bison libgmp-dev zlib1g-dev automake pkg-config libtool wget libkrb5-dev autoconf
+    sudo apt install -y lcov bison flex g++ libssl-dev openssl cmake git build-essential autoconf texinfo flex patch bison libgmp-dev zlib1g-dev automake pkg-config libtool wget libkrb5-dev autoconf
     LOG_INFO "install basic-package-depends for ubuntu success..."
 
     LOG_INFO "install gsasl ... "
@@ -106,7 +106,7 @@ install_ubuntu_depends()
 install_macos_depends()
 {
     LOG_INFO "install depends for macos ..."
-    brew install clang cmake autoconf gsasl nasm
+    brew install clang cmake autoconf gsasl nasm lcov
     LOG_INFO "install depends for macos success ..."
 }
 

diff --git a/cpp/wedpr-main/common/NodeStarter.h b/cpp/wedpr-main/common/NodeStarter.h
@@ -21,6 +21,7 @@
 #include <execinfo.h>
 #include <libhelper/CommandHelper.h>
 #include <libhelper/ExitHandler.h>
+#include <signal.h>
 #include <stdexcept>
 #include <thread>