Merge branch 'bk' of https://github.com/XiaoLiang2333/pika into bk

OpenAtomFoundation · Jul 5, 2024 · 8f81863 · 8f81863
2 parents 784d572 + d859e24
commit 8f81863
Show file tree

Hide file tree

Showing 172 changed files with 14,958 additions and 8,808 deletions.
diff --git a/.github/pr-title-checker-config.json b/.github/pr-title-checker-config.json
@@ -4,7 +4,7 @@
     "color": "B60205"
   },
   "CHECKS": {
-    "regexp": "^(feat|fix|test|refactor|chore|upgrade|style|docs|perf|build|ci|revert)(\\(.*\\))?:.*",
+    "regexp": "^(feat|fix|test|refactor|chore|upgrade|style|docs|perf|build|ci|revert)(\\(.*\\))?:[^\u4e00-\u9fa5]+$",
     "ignoreLabels": [
       "ignore-title"
     ]

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "unstable", "3.5" ]
+    branches: [ "unstable", "3.5" , "4.0"]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "unstable", "3.5" ]
+    branches: [ "unstable", "3.5" , "4.0"]
   schedule:
     - cron: '25 19 * * 6'
 

diff --git a/.github/workflows/codis.yml b/.github/workflows/codis.yml
@@ -5,9 +5,9 @@ name: Codis
 
 on:
   push:
-    branches: [ "unstable", "3.5" ]
+    branches: [ "unstable", "3.5" , "4.0" ]
   pull_request:
-    branches: [ "unstable", "3.5" ]
+    branches: [ "unstable", "3.5" , "4.0"]
 
 jobs:
 

diff --git a/.github/workflows/pika.yml b/.github/workflows/pika.yml
@@ -2,9 +2,9 @@ name: Pika
 
 on:
   push:
-    branches: [ "unstable", "3.5" ]
+    branches: [ "unstable", "3.5" , "4.0"]
   pull_request:
-    branches: [ "unstable", "3.5" ]
+    branches: [ "unstable", "3.5" , "4.0"]
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -26,25 +26,20 @@ jobs:
         with:
           go-version: 1.19
 
+      - name: ccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          key: ubuntu-latest
+
       - name: Install Deps
-        if: ${{ steps.cache.output.cache-hit != 'true' }}
         run: |
           sudo apt-get install -y autoconf libprotobuf-dev protobuf-compiler
           sudo apt-get install -y clang-tidy-12
 
       - 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: cmake -B build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DUSE_PIKA_TOOLS=ON -DCMAKE_CXX_FLAGS_DEBUG=-fsanitize=address
-
-      - name: Cache Build
-        uses: actions/cache@v3
-        id: cache-ubuntu
-        with:
-          key: ${{ runner.os }}-build-ubuntu-${{ hashFiles('**/CMakeLists.txt') }}
-          path: |
-            ${{ github.workspace }}/buildtrees
-            ${{ github.workspace }}/deps
+        run: cmake -B build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DUSE_PIKA_TOOLS=ON -DCMAKE_CXX_FLAGS_DEBUG=-fsanitize=address -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
 
       - name: Build
         # Build your program with the given configuration
@@ -89,6 +84,74 @@ jobs:
       image: centos:7
 
     steps:
+      - name: set up mirror
+        run: |
+          rm -rf /etc/yum.repos.d/CentOS-Base.repo 
+          cat > /etc/yum.repos.d/CentOS-Base.repo << EOL
+          [base]
+          name=CentOS-\$releasever - Base
+          baseurl=https://mirrors.aliyun.com/centos-vault/7.9.2009/os/\$basearch/
+          gpgcheck=1
+          gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+          
+          [updates]
+          name=CentOS-\$releasever - Updates
+          baseurl=https://mirrors.aliyun.com/centos-vault/7.9.2009/updates/\$basearch/
+          gpgcheck=1
+          gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+          
+          [extras]
+          name=CentOS-\$releasever - Extras
+          baseurl=https://mirrors.aliyun.com/centos-vault/7.9.2009/extras/\$basearch/
+          gpgcheck=1
+          gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+          
+          [centosplus]
+          name=CentOS-\$releasever - Plus
+          baseurl=https://mirrors.aliyun.com/centos-vault/7.9.2009/centosplus/\$basearch/
+          gpgcheck=1
+          enabled=0
+          gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+          EOL
+          
+          cat > /etc/yum.repos.d/CentOS-SCLo-scl.repo << EOL
+          [centos-sclo-sclo]
+          name=CentOS-7 - SCLo sclo
+          baseurl=https://mirrors.aliyun.com/centos/7/sclo/x86_64/sclo/
+          gpgcheck=1
+          enabled=1
+          gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo
+          
+          [centos-sclo-sclo-source]
+          name=CentOS-7 - SCLo sclo Source
+          baseurl=https://mirrors.aliyun.com/centos/7/sclo/Source/sclo/
+          gpgcheck=1
+          enabled=0
+          gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo
+          EOL
+          
+          cat > /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo << EOL
+          [centos-sclo-rh]
+          name=CentOS-7 - SCLo rh
+          baseurl=https://mirrors.aliyun.com/centos/7/sclo/x86_64/rh/
+          gpgcheck=1
+          enabled=1
+          gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo
+          
+          [centos-sclo-rh-source]
+          name=CentOS-7 - SCLo rh Source
+          baseurl=https://mirrors.aliyun.com/centos/7/sclo/Source/rh/
+          gpgcheck=1
+          enabled=0
+          gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo
+          EOL
+          
+          rpm --import https://www.centos.org/keys/RPM-GPG-KEY-CentOS-7
+          rpm --import https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-SCLo
+          
+          yum clean all
+          yum makecache
+
       - name: Install deps
         run: |
           yum install -y wget git autoconf centos-release-scl gcc
@@ -166,25 +229,21 @@ jobs:
         with:
           go-version: 1.19
 
+      - name: ccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          key: macos-12
+
       - name: Install Deps
         run: |
           brew update
           brew install --overwrite [email protected] autoconf protobuf llvm wget git
           brew install gcc@10 automake cmake make binutils
+
       - name: Configure CMake
         run: |
           export CC=/usr/local/opt/gcc@10/bin/gcc-10 
-          cmake -B build -DCMAKE_C_COMPILER=/usr/local/opt/gcc@10/bin/gcc-10 -DUSE_PIKA_TOOLS=ON -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_CXX_FLAGS_DEBUG=-fsanitize=address
-
-      - uses: actions/cache@v3
-        with:
-          path: ${{ github.workspace }}/deps
-          key: ${{ runner.os }}-deps-${{ hashFiles('**/CMakeLists.txt') }}
-
-      - uses: actions/cache@v3
-        with:
-          path: ${{ github.workspace }}/buildtrees
-          key: ${{ runner.os }}-buildtrees-${{ hashFiles('**/CMakeLists.txt') }}
+          cmake -B build -DCMAKE_C_COMPILER=/usr/local/opt/gcc@10/bin/gcc-10 -DUSE_PIKA_TOOLS=ON -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_CXX_FLAGS_DEBUG=-fsanitize=address -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
 
       - name: Build
         run: |

diff --git a/.github/workflows/pr-title-checker.yaml b/.github/workflows/pr-title-checker.yaml
@@ -12,7 +12,7 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: thehanimo/[email protected].1
+      - uses: thehanimo/[email protected].2
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           pass_on_octokit_error: false

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
         include:
           - os: ubuntu-latest
             name: ${{ github.event.repository.name }}-${{ github.ref_name }}-ubuntu-amd64.tar.gz
-          - os: macos-latest
+          - os: macos-12
             name: ${{ github.event.repository.name }}-${{ github.ref_name }}-macos-amd64.tar.gz
 
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/tools_go.yml b/.github/workflows/tools_go.yml
@@ -2,11 +2,11 @@ name: Tools_go_build
 
 on:
   push:
-    branches: [ "unstable", "3.5" ]
+    branches: [ "unstable", "3.5" , "4.0"]
     paths:
       - 'tools/**'
   pull_request:
-    branches: [ "unstable", "3.5" ]
+    branches: [ "unstable", "3.5" , "4.0"]
     paths:
       - 'tools/**'