summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryangwei <[email protected]>2023-08-04 16:18:11 +0800
committeryangwei <[email protected]>2023-08-04 16:18:11 +0800
commit684fed2a8ecb07fe550e69251e3f8c661c8ceb7b (patch)
treefb4da8158c42402a3564240fab4960b8b4c676f6
parent80245710126460a4681eb28f333eab5eab3a0cba (diff)
🐎 ci(update ci trigger): make package only develop-*v4.0.0
-rw-r--r--.gitlab-ci.yml36
-rw-r--r--ci/travis.sh6
2 files changed, 16 insertions, 26 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 376f171..3985e92 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,7 +51,7 @@ branch_build_debug_for_centos7:
BUILD_TYPE: Debug
UNIT_TEST: 1
except:
- - /^develop.*$/i
+ - /^develop-*$/i
- /^master.*$/i
- tags
@@ -62,7 +62,7 @@ branch_build_release_for_centos7:
UNIT_TEST: 1
extends: .build_by_travis_for_centos7
except:
- - /^develop.*$/i
+ - /^develop-*$/i
- /^master.*$/i
- tags
@@ -79,11 +79,11 @@ develop_build_debug_for_centos7:
PULP3_REPO_NAME: framework-testing-x86_64.el7
PULP3_DIST_NAME: framework-testing-x86_64.el7
artifacts:
- name: "fieldstat3-$CI_COMMIT_REF_NAME-debug"
+ name: "fieldstat4-$CI_COMMIT_REF_NAME-debug"
paths:
- build/*.rpm
only:
- - /^develop.*$/i
+ - /^develop-*$/i
- /^master.*$/i
develop_build_release_for_centos7:
@@ -98,11 +98,11 @@ develop_build_release_for_centos7:
PULP3_REPO_NAME: framework-testing-x86_64.el7
PULP3_DIST_NAME: framework-testing-x86_64.el7
artifacts:
- name: "fieldstat3-$CI_COMMIT_REF_NAME-release"
+ name: "fieldstat4-$CI_COMMIT_REF_NAME-release"
paths:
- build/*.rpm
only:
- - /^develop.*$/i
+ - /^develop-*$/i
- /^master.*$/i
release_build_debug_for_centos7:
@@ -116,7 +116,7 @@ release_build_debug_for_centos7:
PULP3_DIST_NAME: framework-stable-x86_64.el7
extends: .build_by_travis_for_centos7
artifacts:
- name: "fieldstat3-$CI_COMMIT_REF_NAME-debug"
+ name: "fieldstat4-$CI_COMMIT_REF_NAME-debug"
paths:
- build/*.rpm
only:
@@ -129,13 +129,11 @@ release_build_release_for_centos7:
UNIT_TEST: 1
PACKAGE: 1
UPLOAD_RPM: 1
- UPLOAD_SYMBOL_FILES: 1
- SYMBOL_TARGET: libfieldstat3
PULP3_REPO_NAME: framework-stable-x86_64.el7
PULP3_DIST_NAME: framework-stable-x86_64.el7
extends: .build_by_travis_for_centos7
artifacts:
- name: "fieldstat3-$CI_COMMIT_REF_NAME-release"
+ name: "fieldstat4-$CI_COMMIT_REF_NAME-release"
paths:
- build/*.rpm
only:
@@ -148,7 +146,7 @@ branch_build_debug_for_centos8:
BUILD_TYPE: Debug
UNIT_TEST: 1
except:
- - /^develop.*$/i
+ - /^develop-*$/i
- /^master.*$/i
- tags
@@ -159,7 +157,7 @@ branch_build_release_for_centos8:
UNIT_TEST: 1
extends: .build_by_travis_for_centos8
except:
- - /^develop.*$/i
+ - /^develop-*$/i
- /^master.*$/i
- tags
@@ -176,11 +174,11 @@ develop_build_debug_for_centos8:
PULP3_REPO_NAME: framework-testing-x86_64.el8
PULP3_DIST_NAME: framework-testing-x86_64.el8
artifacts:
- name: "fieldstat3-$CI_COMMIT_REF_NAME-debug"
+ name: "fieldstat4-$CI_COMMIT_REF_NAME-debug"
paths:
- build/*.rpm
only:
- - /^develop.*$/i
+ - /^develop-*$/i
- /^master.*$/i
develop_build_release_for_centos8:
@@ -195,11 +193,11 @@ develop_build_release_for_centos8:
PULP3_REPO_NAME: framework-testing-x86_64.el8
PULP3_DIST_NAME: framework-testing-x86_64.el8
artifacts:
- name: "fieldstat3-$CI_COMMIT_REF_NAME-release"
+ name: "fieldstat4-$CI_COMMIT_REF_NAME-release"
paths:
- build/*.rpm
only:
- - /^develop.*$/i
+ - /^develop-*$/i
- /^master.*$/i
release_build_debug_for_centos8:
@@ -213,7 +211,7 @@ release_build_debug_for_centos8:
PULP3_DIST_NAME: framework-stable-x86_64.el8
extends: .build_by_travis_for_centos8
artifacts:
- name: "fieldstat3-$CI_COMMIT_REF_NAME-debug"
+ name: "fieldstat4-$CI_COMMIT_REF_NAME-debug"
paths:
- build/*.rpm
only:
@@ -226,13 +224,11 @@ release_build_release_for_centos8:
UNIT_TEST: 1
PACKAGE: 1
UPLOAD_RPM: 1
- UPLOAD_SYMBOL_FILES: 1
- SYMBOL_TARGET: libfieldstat3
PULP3_REPO_NAME: framework-stable-x86_64.el8
PULP3_DIST_NAME: framework-stable-x86_64.el8
extends: .build_by_travis_for_centos8
artifacts:
- name: "fieldstat3-$CI_COMMIT_REF_NAME-release"
+ name: "fieldstat4-$CI_COMMIT_REF_NAME-release"
paths:
- build/*.rpm
only:
diff --git a/ci/travis.sh b/ci/travis.sh
index d9c2256..dc6c83c 100644
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -68,9 +68,3 @@ if [ -n "${UPLOAD_RPM}" ]; then
python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm
fi
-if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then
- rpm -i $SYMBOL_TARGET*debuginfo*.rpm
- _symbol_file=`find /usr/lib/debug/ -name "$SYMBOL_TARGET*.so*.debug"`
- cp $_symbol_file ${_symbol_file}info.${CI_COMMIT_SHORT_SHA}
- sentry-cli upload-dif -t elf ${_symbol_file}info.${CI_COMMIT_SHORT_SHA}
-fi