fix ctest execute fail，remove duplicate ci

arana-db · Oct 12, 2024 · 4156d90 · 4156d90
1 parent d65be5c
commit 4156d90
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/import_braft.yml b/.github/workflows/import_braft.yml
@@ -2,6 +2,7 @@ name: Import BRaft Actions (Temporary)
 
 on:
   push:
+    branches: [ "import-braft" ]
   pull_request:
     branches: [ "import-braft" ]
 

diff --git a/.github/workflows/pikiwidb.yml b/.github/workflows/pikiwidb.yml
@@ -2,9 +2,13 @@ name: kiwi
 
 on:
   push:
+    branches: [ "unstable" ]
   pull_request:
     branches: [ "unstable" ]
 
+env:
+  BUILD_DIR: cmake-build-release
+
 jobs:
   check_format:
     runs-on: ubuntu-latest
@@ -16,7 +20,7 @@ jobs:
         run: bash ./etc/script/ci/build.sh
 
       - name: Check Format
-        working-directory: ${{ github.workspace }}/build
+        working-directory: ${{ github.workspace }}/${{ env.BUILD_DIR}}
         run: make check-format
 
   build_on_macos:
@@ -33,7 +37,7 @@ jobs:
           bash ./etc/script/build.sh --verbose
 
       - name: GTest
-        working-directory: ${{ github.workspace }}/build-release
+        working-directory: ${{ github.workspace }}/${{ env.BUILD_TYPE }}
         # Execute tests defined by the CMake configuration.
         # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
         run: ctest
@@ -44,7 +48,7 @@ jobs:
           ./etc/script/kiwitests.sh all
 
       - name: Run Go E2E Tests
-        working-directory: ${{ github.workspace }}/build-release
+        working-directory: ${{ github.workspace }}/${{ env.BUILD_TYPE }}
         run: |
           set +e
           cd ../tests
@@ -64,7 +68,7 @@ jobs:
           bash ./etc/script/build.sh --verbose
 
       - name: GTest
-        working-directory: ${{ github.workspace }}/build-release
+        working-directory: ${{ github.workspace }}/${{ env.BUILD_TYPE }}
         # Execute tests defined by the CMake configuration.
         # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
         run: ctest
@@ -75,7 +79,7 @@ jobs:
           ./etc/script/kiwitests.sh all
 
       - name: Run Go E2E Tests
-        working-directory: ${{ github.workspace }}/build-release
+        working-directory: ${{ github.workspace }}/${{ env.BUILD_TYPE }}
         run: |
           set +e
           cd ../tests