From d468e6ca1d443f3f00ea9bb62a6383b1a90803c9 Mon Sep 17 00:00:00 2001
From: yangwei <yangwei@geedgenetworks.com>
Date: Thu, 28 Nov 2024 15:33:30 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=8E=20ci(ci=20disable=20parallel=20mak?=
 =?UTF-8?q?e):=20build=20script?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml                    | 9 ++-------
 deps/dablooms/test/CMakeLists.txt | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52e76b2..6e69849 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,7 +44,7 @@ stages:
     -DASAN_OPTION=$ASAN_OPTION 
     -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX 
     ..
-  - make -j4 VERBOSE=1
+  - make -j4
 
 ###############################################################################
 # cppcheck
@@ -102,11 +102,6 @@ build:
     BUILD_TYPE: "RelWithDebInfo"  
     ASAN_OPTION: "OFF"
   script: *build_script
-  artifacts:
-    name: "artifacts-${CI_COMMIT_REF_NAME}-${TAG}-${BUILD_TYPE}"
-    paths:
-      - build/infra/*.rpm
-    when: on_success
 ###############################################################################
 # test
 ###############################################################################
@@ -115,6 +110,7 @@ test:
   parallel:
     matrix:
       - <<: *predefined_matrix_x86_64_el8  
+        ASAN_OPTION: "ADDRESS"
       - <<: *predefined_matrix_aarch64_el9  
   image: $BUILD_IMAGE
   tags:
@@ -124,7 +120,6 @@ test:
   before_script: *everything_before_script
   variables:
     BUILD_TYPE: "Debug"  
-    ASAN_OPTION: "ADDRESS"  
   script: 
     - *build_script
     - ctest -V
diff --git a/deps/dablooms/test/CMakeLists.txt b/deps/dablooms/test/CMakeLists.txt
index cdb4cce..9b7c63b 100644
--- a/deps/dablooms/test/CMakeLists.txt
+++ b/deps/dablooms/test/CMakeLists.txt
@@ -2,4 +2,4 @@ add_executable(gtest_dablooms gtest_dablooms.cpp)
 target_link_libraries(gtest_dablooms dablooms gtest)
 
 include(GoogleTest)
-gtest_discover_tests(gtest_dablooms DISCOVERY_TIMEOUT 60)
\ No newline at end of file
+gtest_discover_tests(gtest_dablooms)