Merge branch 'main' into main

alibaba · Oct 31, 2023 · 50a5afb · 50a5afb
2 parents 0730d09 + 18ac0ec
commit 50a5afb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
@@ -14,10 +14,16 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Install newer Clang
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x ./llvm.sh
+          sudo ./llvm.sh 17
+
       - name: Build
         working-directory: ${{github.workspace}}
-        run: bazel build --action_env=CXX=clang++ --action_env=CC=clang ...
+        run: bazel build --action_env=CXX=clang++-17 --action_env=CC=clang-17 ...
 
       - name: Test
         working-directory: ${{github.workspace}}
-        run: bazel test --action_env=CXX=clang++ --action_env=CC=clang --test_output=errors ...
+        run: bazel test --action_env=CXX=clang++-17 --action_env=CC=clang-17 --test_output=errors ...
diff --git a/.github/workflows/ubuntu_clang.yml b/.github/workflows/ubuntu_clang.yml
@@ -31,6 +31,12 @@ jobs:
       - name: Install ninja-build tool
         uses: seanmiddleditch/gha-setup-ninja@master
 
+      - name: Install newer Clang
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x ./llvm.sh
+          sudo ./llvm.sh 17
+
       - name: ccache
         uses: hendrikmuhs/[email protected]
         with:
@@ -40,7 +46,7 @@ jobs:
         run: |
           cmake -B ${{github.workspace}}/build -G Ninja \
                 -DCMAKE_BUILD_TYPE=${{matrix.mode}} -DBUILD_WITH_LIBCXX=${{matrix.libcxx}} -DENABLE_SSL=${{matrix.ssl}} \
-                -DUSE_CCACHE=${{env.ccache}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
+                -DUSE_CCACHE=${{env.ccache}} -DCMAKE_C_COMPILER=clang-17 -DCMAKE_CXX_COMPILER=clang++-17
       - name: Build
         run: cmake --build ${{github.workspace}}/build --config ${{matrix.mode}}
 
@@ -69,6 +75,12 @@ jobs:
       - name: Install ninja-build tool
         uses: seanmiddleditch/gha-setup-ninja@v3
 
+      - name: Install newer Clang
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x ./llvm.sh
+          sudo ./llvm.sh 17
+
       - name: Check protoc
         run: protoc --version
 
@@ -81,7 +93,7 @@ jobs:
           CXX=clang++ CC=clang 
           cmake -B ${{github.workspace}}/build -G Ninja \
                 -DCMAKE_BUILD_TYPE=${{matrix.mode}} -DBUILD_WITH_LIBCXX=${{matrix.libcxx}} -DENABLE_SSL=${{matrix.ssl}} \
-                -DUSE_CCACHE=${{env.ccache}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++\
+                -DUSE_CCACHE=${{env.ccache}} -DCMAKE_C_COMPILER=clang-17 -DCMAKE_CXX_COMPILER=clang++-17\
                 -DBUILD_CORO_HTTP=OFF -DBUILD_CORO_IO=OFF -DBUILD_CORO_RPC=OFF -DBUILD_EASYLOG=OFF -DBUILD_STRUCT_JSON=OFF -DBUILD_STRUCT_XML=OFF -DBUILD_STRUCT_YAML=OFF -DBUILD_UTIL=OFF
       - name: Build
         run: cmake --build ${{github.workspace}}/build --config ${{matrix.mode}}

diff --git a/src/struct_pb/protoc-plugin/CMakeLists.txt b/src/struct_pb/protoc-plugin/CMakeLists.txt
@@ -12,6 +12,7 @@ if (Protobuf_FOUND)
     )
 else ()
     message(INFO "struct_pb is skipped. To build struct_pb protoc plugin, you must install libprotoc first!!!\n"
+
             "see https://alibaba.github.io/yalantinglibs/en/struct_pb/struct_pb_generating_your_struct.html"
             )
 endif ()