Merge pull request OpenAtomFoundation#1 from AlexStocks/lihao-clang

modify clang

.github/workflows/pika.yml

@@ -30,7 +30,7 @@ jobs:
       - name: install Deps
         if: ${{ steps.cache.output.cache-hit != 'true' }}
         run: |
-          sudo apt install autoconf libprotobuf-dev protobuf-compiler clang-tidy -y
+          sudo apt install autoconf libprotobuf-dev protobuf-compiler -y
 
       - name: Configure CMake
         # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
@@ -41,12 +41,64 @@ jobs:
         # Build your program with the given configuration
         run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
-      - name: Clang-tidy Check
+      - name: Test
         working-directory: ${{github.workspace}}/build
-        run: make clang-tidy
+        # Execute tests defined by the CMake configuration.
+        # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+        run: ctest -C ${{env.BUILD_TYPE}}
+
+  build_on_centos:
+    # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
+    # You can convert this to a matrix build if you need cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ubuntu-latest
+    container:
+      image: centos:7
+
+    steps:
+      - name: Install deps
+        # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+        # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+        run: |
+          yum install -y wget git autoconf centos-release-scl
+          yum install -y devtoolset-10-gcc devtoolset-10-gcc-c++ devtoolset-10-make devtoolset-10-bin-util
+          source /opt/rh/devtoolset-10/enable
+          gcc --version
+          make --version
+
+
+      - name: Install cmake
+        run: |
+          wget https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-linux-x86_64.sh
+          bash ./cmake-3.26.4-linux-x86_64.sh --skip-license --prefix=/usr
+          cmake --version
+
+      - name: checkout
+        working-directory: ${{github.workspace}}
+        run: |
+          echo Fetching $GITHUB_REPOSITORY@$GITHUB_SHA
+          git init
+          git fetch --depth 1 https://github.com/$GITHUB_REPOSITORY $GITHUB_SHA
+          git checkout $GITHUB_SHA
+
+      - name: Configure CMake
+        # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+        # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+        run: |
+          source /opt/rh/devtoolset-10/enable
+          cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_PIKA_TOOLS=ON
+
+      - name: Build
+        # Build your program with the given configuration
+        run: |
+          cd ${{github.workspace}}
+          source /opt/rh/devtoolset-10/enable
+          cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
       - name: Test
-        working-directory: ${{github.workspace}}/build
         # Execute tests defined by the CMake configuration.
         # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-        run: ctest -C ${{env.BUILD_TYPE}}
+        run: |
+          cd ${{github.workspace}}/build
+          source /opt/rh/devtoolset-10/enable
+          ctest -C ${{env.BUILD_TYPE}}

.github/workflows/tools_go.yml

@@ -0,0 +1,47 @@
+name: Tools_go_build
+
+on:
+  push:
+    branches: [ "unstable" ]
+    paths:
+      - 'tools/**'
+  pull_request:
+    branches: [ "unstable" ]
+    paths:
+      - 'tools/**'
+
+jobs:
+
+  build_pika_exporter:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.19
+
+    - name: Build
+      run: |
+        cd tools/pika_exporter && make -j
+    - name: Test
+      run: |
+        cd tools/pika_exporter && make -j
+
+  build_codis2pika:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.19
+
+    - name: Build
+      run: |
+        cd tools/codis2pika && sh build.sh
+    - name: Test
+      run: |
+        cd tools/codis2pika && sh build.sh

CMakeLists.txt

@@ -89,9 +89,6 @@ if (${AUTOCONF} MATCHES AUTOCONF-NOTFOUND)
   message(FATAL_ERROR "not find autoconf on localhost")
 endif()
 
-set(CLANG_SEARCH_PATH "/usr/local/bin" "/usr/bin" "/usr/local/opt/llvm/bin" "/usr/local/opt/llvm@12/bin"
-        "/usr/local/Cellar/llvm/12.0.1/bin" "/opt/homebrew/opt/llvm@12/bin/")
-
 find_program(CLANG_TIDY_BIN
         NAMES clang-tidy clang-tidy-12
         HINTS ${CLANG_SEARCH_PATH})
@@ -263,7 +260,11 @@ else()
   set(LIB_GLOG libglog.a)
 endif()
 
-set(GLOG_LIBRARY ${INSTALL_LIBDIR}/${LIB_GLOG})
+if(${OS_VERSION} MATCHES "CentOS")
+  set(GLOG_LIBRARY ${INSTALL_LIBDIR_64}/${LIB_GLOG})
+else()
+  set(GLOG_LIBRARY ${INSTALL_LIBDIR}/${LIB_GLOG})
+endif()
 set(GLOG_INCLUDE_DIR ${INSTALL_INCLUDEDIR})
 
 ExternalProject_Add(snappy
@@ -756,7 +757,7 @@ target_link_libraries(${PROJECT_NAME}
   storage
   net
   pstd
-  ${LIB_GLOG}
+  ${GLOG_LIBRARY}
   librocksdb.a
   ${LIB_PROTOBUF}
   ${LIB_GFLAGS}
@@ -768,21 +769,6 @@ target_link_libraries(${PROJECT_NAME}
   ${LIBUNWIND_LIBRARY}
   ${JEMALLOC_LIBRARY})
 
-option(ENABLE_IPO "enable interprocedural optimization" ON)
-if (ENABLE_IPO)
-  include(CheckIPOSupported)
-  check_ipo_supported(RESULT ipo_result OUTPUT ipo_output LANGUAGES CXX)
-
-  if (ipo_result)
-    set_property(TARGET ${PROJECT_NAME} PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-      target_link_libraries(${PROJECT_NAME} PUBLIC "-fuse-ld=lld")
-    endif ()
-  else ()
-    message(WARNING "IPO is not supported: ${ipo_output}")
-  endif ()
-endif ()
-
 option(USE_SSL "Enable SSL support" OFF)
 add_custom_target(
         clang-tidy

format_code.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-find include src pika-tools -regex '.*\.\(cpp\|hpp\|c\|h\|cc\)' | xargs clang-format -i
+find include src tools -regex '.*\.\(cpp\|hpp\|c\|h\|cc\)' | xargs clang-format -i
 
 
 # If you want to automatically format your code before git commit