Skip to content

Commit

Permalink
use tilde for PR names
Browse files Browse the repository at this point in the history
  • Loading branch information
chilagrow committed Feb 14, 2025
1 parent e7ce59f commit 5db2030
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions ferretdb_packaging/defineversion/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,14 @@ func define(controlDefaultVersion string, getenv githubactions.GetenvFunc) (stri
}

// defineForPR defines package version for pull requests.
// It replaces branch name characters not allowed in debian package version with `_`.
// It replaces branch name with allowed chars of debian package version.
func defineForPR(version, branch string) string {
// for branches like "dependabot/submodules/XXX"
parts := strings.Split(branch, "/")
branch = parts[len(parts)-1]
branch = debianVer.ReplaceAllString(branch, "_")
branch = debianVer.ReplaceAllString(branch, "~")

return fmt.Sprintf("%s~pre.pr_%s", version, branch)
return fmt.Sprintf("%s~pre.pr~%s", version, branch)
}

// defineForBranch defines package version for branch builds.
Expand Down
6 changes: 3 additions & 3 deletions ferretdb_packaging/defineversion/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func TestDefine(t *testing.T) {
"GITHUB_REF_TYPE": "branch",
},
defaultVersion: "0.100-0",
expected: "0.100.0~pre.pr_define_docker_tag",
expected: "0.100.0~pre.pr~define~docker~tag",
},

"pull_request/dependabot": {
Expand All @@ -66,7 +66,7 @@ func TestDefine(t *testing.T) {
"GITHUB_REF_TYPE": "branch",
},
defaultVersion: "0.100-0",
expected: "0.100.0~pre.pr_mongo_go_driver_29d768e",
expected: "0.100.0~pre.pr~mongo~go~driver~29d768e",
},

"pull_request_target": {
Expand All @@ -78,7 +78,7 @@ func TestDefine(t *testing.T) {
"GITHUB_REF_TYPE": "branch",
},
defaultVersion: "0.100-0",
expected: "0.100.0~pre.pr_define_docker_tag",
expected: "0.100.0~pre.pr~define~docker~tag",
},

"push/main": {
Expand Down

0 comments on commit 5db2030

Please sign in to comment.