Skip to content

Commit bb0f883

Browse files
committed
Pull request #32: fix version naming for branches with slashes release branch
Merge in ISGAPPSEC/cyperf-api-wrapper from fix-jenkins-file to release/7.0 Squashed commit of the following: commit b987c8be3e7db838a7f6b8d76b1f15a6e7c9526c Author: iustmitu <[email protected]> Date: Thu Jul 24 13:54:40 2025 +0300 using - instead of . for better version name commit 150e953833eee92e97309c47b36a8a0fbbd6025b Author: iustmitu <[email protected]> Date: Thu Jul 24 12:51:01 2025 +0300 small fix commit fbea0f0a9460954f703db82179ee7b19e26b9707 Author: iustmitu <[email protected]> Date: Thu Jul 24 12:40:03 2025 +0300 fix slash in branch name
1 parent f77c9e1 commit bb0f883

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

jenkins/JenkinsFile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def do_publish = params.publish_pypi
3737

3838
@NonCPS
3939
boolean setDisplayVersion(publish) {
40-
branch_sanitized = branch.replaceAll('-', '.').replaceAll('_', '.')
40+
branch_sanitized = branch.replaceAll('-', '.').replaceAll('_', '.').replaceAll('%2F', '-')
4141
def matcher = Pattern.compile("^release%2F([0-9]+)\\.([0-9]+)\$").matcher(branch)
4242
if (matcher.matches()) {
4343
build_number = "dev${env.BUILD_NUMBER}+${branch_sanitized}"

0 commit comments

Comments
 (0)