summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryangwei <[email protected]>2023-10-09 19:24:45 +0800
committeryangwei <[email protected]>2023-10-09 20:46:27 +0800
commita74a6f74e2deadc72b09cfe1e81bc8f729881ae3 (patch)
tree452579a52a39f17a4bdb6383e5141a224e43ccff
parentfee1ecba3cbfdef5fc04a54cb1fd6ee121d0925f (diff)
🐎 ci(build stage rename): 调整build各阶段命名,和对应的test阶段依赖v4.3.30
-rw-r--r--.gitlab-ci.yml58
1 files changed, 13 insertions, 45 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 512be68..7837140 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,20 +89,7 @@ run_cppcheck_for_centos8:
image: $BUILD_IMAGE_CENTOS7
-branch_build_debug_for_centos7:
- extends: .build_by_travis_for_centos7
- variables:
- BUILD_TYPE: Debug
- artifacts:
- paths:
- - build/*
- except:
- - /^dev*.*$/i
- - /^rel*.*$/i
- - /^master.*$/i
- - tags
-
-develop_build_debug_for_centos7:
+develop_build_for_centos7:
extends: .build_by_travis_for_centos7
variables:
BUILD_TYPE: RelWithDebInfo
@@ -110,10 +97,8 @@ develop_build_debug_for_centos7:
name: "$SYMBOL_TARGET-$CI_COMMIT_REF_NAME-debug"
paths:
- build/*
- only:
- - /^dev*.*$/i
- - /^rel*.*$/i
- - /^master.*$/i
+ except:
+ - tags
release_build_debug_for_centos7:
extends: .build_by_travis_for_centos7
@@ -131,7 +116,7 @@ release_build_debug_for_centos7:
only:
- tags
-release_build_release_for_centos7:
+release_build_for_centos7:
extends: .build_by_travis_for_centos7
variables:
BUILD_TYPE: RelWithDebInfo
@@ -149,20 +134,7 @@ release_build_release_for_centos7:
image: $BUILD_IMAGE_CENTOS8
extends: .build_before_script
-branch_build_debug_for_centos8:
- extends: .build_by_travis_for_centos8
- variables:
- BUILD_TYPE: Debug
- artifacts:
- paths:
- - build/*
- except:
- - /^dev*.*$/i
- - /^rel*.*$/i
- - /^master.*$/i
- - tags
-
-develop_build_debug_for_centos8:
+develop_build_for_centos8:
extends: .build_by_travis_for_centos8
variables:
BUILD_TYPE: RelWithDebInfo
@@ -170,10 +142,8 @@ develop_build_debug_for_centos8:
name: "$SYMBOL_TARGET-$CI_COMMIT_REF_NAME-debug"
paths:
- build/*
- only:
- - /^dev*.*$/i
- - /^rel*.*$/i
- - /^master.*$/i
+ except:
+ - tags
release_build_debug_for_centos8:
extends: .build_by_travis_for_centos8
@@ -188,7 +158,7 @@ release_build_debug_for_centos8:
only:
- tags
-release_build_release_for_centos8:
+release_build_for_centos8:
extends: .build_by_travis_for_centos8
variables:
BUILD_TYPE: RelWithDebInfo
@@ -228,7 +198,7 @@ envelope_rpm_for_centos8:
paths:
- build/*-pr-*.rpm
dependencies:
- - release_build_release_for_centos8
+ - release_build_for_centos8
###############################################################################
@@ -247,10 +217,8 @@ envelope_rpm_for_centos8:
- cd build; ctest3; pwd
- cd testing/ && ldd $TEST_NAME
dependencies:
- - branch_build_debug_for_centos8
- - develop_build_debug_for_centos8
-# - release_build_debug_for_centos8
- - release_build_release_for_centos8
+ - develop_build_for_centos8
+ - release_build_for_centos8
tags:
- share
@@ -319,7 +287,7 @@ rpm_upload_for_centos7:
extends: .define_before_upload_centos7
dependencies:
- release_build_debug_for_centos7
- - release_build_release_for_centos7
+ - release_build_for_centos7
script:
- python3 rpm_upload_tools.py $PULP3_REPO_NAME $PULP3_DIST_NAME *.rpm
@@ -341,7 +309,7 @@ rpm_upload_for_centos8:
extends: .define_before_upload_centos8
dependencies:
- release_build_debug_for_centos8
- - release_build_release_for_centos8
+ - release_build_for_centos8
script:
- python3 rpm_upload_tools.py $PULP3_REPO_NAME $PULP3_DIST_NAME *.rpm