<fix>(CI): add ubuntu upload, try to fix windows compile cppsdk error.

kyonRay · Nov 26, 2024 · 1d2788e · 1d2788e
1 parent 631fa05
commit 1d2788e
Show file tree

Hide file tree

Showing 10 changed files with 141 additions and 23 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ concurrency:
 jobs:
   compile_macOS_release:
     name: upload standard binary of macOS
-    runs-on: macos-15-large
+    runs-on: macos-15
     # runs-on: self-hosted-mac
     # if: startsWith(github.ref,'v2')
     steps:
@@ -42,55 +42,55 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: bin/fisco-bcos.tar.gz
-          asset_name: fisco-bcos-macOS-x86_64.tar.gz
+          asset_name: fisco-bcos-macOS-arm.tar.gz
           tag: ${{ github.ref }}
           overwrite: true
       - name: Upload fisco-bcos-lightnode binaries to release
         uses: svenstaro/upload-release-action@v1-release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: bin/lightnode.tar.gz
-          asset_name: fisco-bcos-lightnode-macOS-x86_64.tar.gz
+          asset_name: fisco-bcos-lightnode-macOS-arm.tar.gz
           tag: ${{ github.ref }}
           overwrite: true
       - name: Upload BcosNodeService binaries to release
         uses: svenstaro/upload-release-action@v1-release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: fisco-bcos-tars-service/BcosNodeService.tgz
-          asset_name: BcosNodeService-macOS-x86_64.tgz
+          asset_name: BcosNodeService-macOS-arm.tgz
           tag: ${{ github.ref }}
           overwrite: true
       - name: Upload BcosRpcService binaries to release
         uses: svenstaro/upload-release-action@v1-release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: fisco-bcos-tars-service/BcosRpcService.tgz
-          asset_name: BcosRpcService-macOS-x86_64.tgz
+          asset_name: BcosRpcService-macOS-arm.tgz
           tag: ${{ github.ref }}
           overwrite: true
       - name: Upload BcosGatewayService binaries to release
         uses: svenstaro/upload-release-action@v1-release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: fisco-bcos-tars-service/BcosGatewayService.tgz
-          asset_name: BcosGatewayService-macOS-x86_64.tgz
+          asset_name: BcosGatewayService-macOS-arm.tgz
           tag: ${{ github.ref }}
           overwrite: true
       - name: Upload BcosMaxNodeService binaries to release
         uses: svenstaro/upload-release-action@v1-release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: fisco-bcos-tars-service/BcosMaxNodeService.tgz
-          asset_name: BcosMaxNodeService-macOS-x86_64.tgz
+          asset_name: BcosMaxNodeService-macOS-arm.tgz
           tag: ${{ github.ref }}
           overwrite: true
       - name: Upload BcosExecutorService binaries to release
         uses: svenstaro/upload-release-action@v1-release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: fisco-bcos-tars-service/BcosExecutorService.tgz
-          asset_name: BcosExecutorService-macOS-x86_64.tgz
+          asset_name: BcosExecutorService-macOS-arm.tgz
           tag: ${{ github.ref }}
           overwrite: true
       - name: Upload build_chain.sh

diff --git a/.github/workflows/workflow-self-hosted-arm.yml b/.github/workflows/workflow-self-hosted-arm.yml
@@ -15,6 +15,8 @@ on:
 
 env:
   ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+  ACTIONS_RUNNER_FORCED_INTERNAL_NODE_VERSION: node16
+  ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
@@ -28,14 +30,22 @@ jobs:
     env:
       VCPKG_ROOT: ~/cache/vcpkg
       DEPS_ROOT: ~/cache/deps
+      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+      ACTIONS_RUNNER_FORCED_INTERNAL_NODE_VERSION: node16
+      ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
     steps:
-      - uses: actions/checkout@v3
-        with:
-          clean: false
       - name: Set up Node.js 16.x
         uses: actions/setup-node@v2
         with:
           node-version: "16.x"
+      - name: Move old nodejs
+        run: |
+          cd $RUNNER_HOME/actions-runner/externals
+          mv node20 node20.bak
+          ln -s node16 node20
+      - uses: actions/checkout@v3
+        with:
+          clean: false
 
       - name: Prepare centos tools
         run: |

diff --git a/.github/workflows/workflow-self-hosted-centos.yml b/.github/workflows/workflow-self-hosted-centos.yml
@@ -12,6 +12,8 @@ concurrency:
   cancel-in-progress: true
 env:
   ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+  ACTIONS_RUNNER_FORCED_INTERNAL_NODE_VERSION: node16
+  ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
 
 jobs:
   build_centos:
@@ -22,11 +24,10 @@ jobs:
     env:
       VCPKG_ROOT: ~/cache/vcpkg
       DEPS_ROOT: ~/cache/deps
+      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+      ACTIONS_RUNNER_FORCED_INTERNAL_NODE_VERSION: node16
+      ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
     steps:
-      - uses: actions/checkout@v3
-        with:
-          clean: false
-
       - name: Set up JDK 1.8
         uses: actions/setup-java@v3
         with:
@@ -37,7 +38,14 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: "16.x"
-
+      - name: Move old nodejs
+        run: |
+          cd $RUNNER_HOME/actions-runner/externals
+          mv node20 node20.bak
+          ln -s node16 node20
+      - uses: actions/checkout@v3
+        with:
+          clean: false
       - name: yum install
         run: |
           sudo yum install -y -q epel-release centos-release-scl flex bison patch gmp-static  glibc-static glibc-devel libzstd-devel

diff --git a/.github/workflows/workflow-self-hosted-ubuntu-upload.yml b/.github/workflows/workflow-self-hosted-ubuntu-upload.yml
@@ -0,0 +1,83 @@
+name: Ubuntu CI Upload
+on:
+  push:
+    paths-ignore:
+      - "docs/**"
+      - "Changelog.md"
+      - "README.md"
+  pull_request:
+    branches:
+      - release-3.*
+      - feature-3.*
+      - bugfix-3.*
+      - master
+  release:
+    types: [ push ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+env:
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+
+jobs:
+  build_centos:
+    name: ubuntu ci upload
+    runs-on: self-hosted-ubuntu
+    strategy:
+      fail-fast: false
+    env:
+      VCPKG_ROOT: /home/ci/cache/vcpkg
+      DEPS_ROOT: /home/ci/cache/deps
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          clean: false
+
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: "8.0.382"
+
+      - name: Set up Node.js 16.x
+        uses: actions/setup-node@v2
+        with:
+          node-version: "16.x"
+
+      - name: apt install
+        run: |
+          sudo apt update
+          sudo apt install -y  lcov ccache wget python3-dev python3-pip git curl zip unzip tar
+          sudo apt install -y --no-install-recommends \
+              clang make build-essential cmake libssl-dev zlib1g-dev ca-certificates \
+              libgmp-dev flex bison patch libzstd-dev ninja-build pkg-config ccache uuid-runtime automake
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly-2024-02-25
+          override: true
+
+      - name: Reuse build cache
+        run: |
+          mkdir -p ./build
+          rm -rf deps
+          ln -s ${{ env.DEPS_ROOT }} deps
+
+      - name: Remove cache if correspond dir change
+        run: ./tools/.ci/clear_build_cache.sh
+
+      - name: update vcpkg
+        run: |
+          cd ${{ env.VCPKG_ROOT }} && git fetch --all && git checkout master && git pull
+          cd -
+
+      - name: Build for linux
+        run: |
+          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+          cd build && cmake -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DTESTS=OFF -DCOVERAGE=OFF -DWITH_LIGHTNODE=ON -DWITH_CPPSDK=OFF -DWITH_TIKV=OFF -DWITH_TARS_SERVICES=OFF -DTOOLS=OFF -DBUILD_STATIC=ON -DALLOCATOR=default .. || cat *.log
+          make -j6
+      - uses: actions/upload-artifact@v3
+        with:
+          name: fisco-bcos.tar.gz
+          path: build/fisco-bcos-air/fisco-bcos
diff --git a/bcos-crypto/bcos-crypto/interfaces/crypto/CommonType.h b/bcos-crypto/bcos-crypto/interfaces/crypto/CommonType.h
@@ -19,8 +19,8 @@
  * @date 2021-04-01
  */
 #pragma once
+#include <bcos-utilities/BoostLog.h>
 #include <bcos-utilities/FixedBytes.h>
-#include <bcos-utilities/Log.h>
 
 #define CRYPTO_LOG(LEVEL) BCOS_LOG(LEVEL) << LOG_BADGE("CRYPTO")
 namespace bcos::crypto

diff --git a/bcos-crypto/bcos-crypto/signature/fastsm2/fast_sm2.cpp b/bcos-crypto/bcos-crypto/signature/fastsm2/fast_sm2.cpp
@@ -18,9 +18,9 @@
  * @date 2022.01.17
  * @author yujiechen
  */
-#include "bcos-utilities/BoostLog.h"
 #include <bcos-crypto/interfaces/crypto/CommonType.h>
 #include <bcos-crypto/signature/fastsm2/fast_sm2.h>
+#include <bcos-utilities/BoostLog.h>
 #include <bcos-utilities/DataConvertUtility.h>
 #include <openssl/bn.h>
 #include <openssl/ec.h>

diff --git a/bcos-crypto/bcos-crypto/signature/hsmSM2/HsmSM2Crypto.cpp b/bcos-crypto/bcos-crypto/signature/hsmSM2/HsmSM2Crypto.cpp
@@ -18,12 +18,13 @@
  * @date 2022.10.07
  * @author lucasli
  */
-#include "hsm-crypto/hsm/CryptoProvider.h"
-#include "hsm-crypto/hsm/SDFCryptoProvider.h"
 #include <bcos-crypto/signature/Exceptions.h>
 #include <bcos-crypto/signature/codec/SignatureDataWithPub.h>
 #include <bcos-crypto/signature/hsmSM2/HsmSM2Crypto.h>
 #include <bcos-crypto/signature/hsmSM2/HsmSM2KeyPair.h>
+#include <bcos-utilities/BoostLog.h>
+#include <hsm-crypto/hsm/CryptoProvider.h>
+#include <hsm-crypto/hsm/SDFCryptoProvider.h>
 #include <algorithm>
 
 using namespace bcos;

diff --git a/bcos-utilities/bcos-utilities/BoostLog.h b/bcos-utilities/bcos-utilities/BoostLog.h
@@ -48,6 +48,22 @@
 #undef ERROR
 #endif
 
+#ifdef TRACE
+#undef TRACE
+#endif
+
+#ifdef INFO
+#undef INFO
+#endif
+
+#ifdef WARNING
+#undef WARNING
+#endif
+
+#ifdef FATAL
+#undef FATAL
+#endif
+
 namespace bcos
 {
 extern std::string const FileLogger;

diff --git a/bcos-utilities/bcos-utilities/BoostLogInitializer.cpp b/bcos-utilities/bcos-utilities/BoostLogInitializer.cpp
@@ -20,9 +20,9 @@
  */
 #include "BoostLogInitializer.h"
 #include "BoostLogThreadNameAttribute.h"
-#include "bcos-framework/bcos-framework/Common.h"
-#include "bcos-utilities/BoostLog.h"
+#include <bcos-framework/Common.h>
 #include <bcos-framework/bcos-framework/protocol/GlobalConfig.h>
+#include <bcos-utilities/BoostLog.h>
 #include <bcos-utilities/RateCollector.h>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/core/null_deleter.hpp>

diff --git a/bcos-utilities/bcos-utilities/Common.cpp b/bcos-utilities/bcos-utilities/Common.cpp
@@ -18,7 +18,7 @@
  * @date 2021-02-24
  */
 
-#include "bcos-utilities/BoostLog.h"
+#include <bcos-utilities/BoostLog.h>
 #define NOMINMAX
 #if defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN32_)
 #define _WIN32_WINNT 0x0601