Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove branch from Debian package versions #32

Merged
merged 2 commits into from
Mar 4, 2025
+39 −39
Merged

Remove branch from Debian package versions #32

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b04f3c
Remove `branch` from Debian package versions
AlekSi Mar 4, 2025
18c0112
Refactor
AlekSi Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Loading
Loading status checks…
Remove branch from Debian package versions 
To match Docker tags.
@AlekSi
AlekSi committed Mar 4, 2025
commit 9b04f3c08a7cf6e3bb37cdbacf77c1ed2aa23834
7 changes: 3 additions & 4 deletions ferretdb_packaging/defineversion/debian.go
View file
Original file line number Diff line number Diff line change
@@ -95,12 +95,11 @@ func defineDebianVersionForPR(controlDefaultVersion, branch string) string {
// defineDebianVersionForBranch returns valid Debian package version for branch.
// See [defineDebianVersion].
func defineDebianVersionForBranch(controlDefaultVersion, branch string) (string, error) {
switch branch {
case "ferretdb":
return fmt.Sprintf("%s~branch~%s", controlDefaultVersion, branch), nil
default:
if branch != "ferretdb" {
return "", fmt.Errorf("unhandled branch %q", branch)
}

return fmt.Sprintf("%s~ferretdb", controlDefaultVersion), nil
}

// defineDebianVersionForTag returns valid Debian package version for tag.
12 changes: 6 additions & 6 deletions ferretdb_packaging/defineversion/main_test.go
View file
Original file line number Diff line number Diff line change
@@ -150,7 +150,7 @@ func TestDefineVersion(t *testing.T) {
"GITHUB_REF_TYPE": "branch",
"GITHUB_REPOSITORY": "FerretDB/documentdb",
},
expectedDebian: "0.100.0~branch~ferretdb",
expectedDebian: "0.100.0~ferretdb",
expectedDocker: &images{
developmentImages: []string{
"ferretdb/postgres-documentdb-dev:17-ferretdb",
@@ -168,7 +168,7 @@ func TestDefineVersion(t *testing.T) {
"GITHUB_REF_TYPE": "branch",
"GITHUB_REPOSITORY": "OtherOrg/OtherRepo",
},
expectedDebian: "0.100.0~branch~ferretdb",
expectedDebian: "0.100.0~ferretdb",
expectedDocker: &images{
developmentImages: []string{
"ghcr.io/otherorg/postgres-otherrepo-dev:17-ferretdb",
@@ -275,7 +275,7 @@ func TestDefineVersion(t *testing.T) {
"GITHUB_REF_TYPE": "branch",
"GITHUB_REPOSITORY": "FerretDB/documentdb",
},
expectedDebian: "0.100.0~branch~ferretdb",
expectedDebian: "0.100.0~ferretdb",
expectedDocker: &images{
developmentImages: []string{
"ferretdb/postgres-documentdb-dev:17-ferretdb",
@@ -293,7 +293,7 @@ func TestDefineVersion(t *testing.T) {
"GITHUB_REF_TYPE": "branch",
"GITHUB_REPOSITORY": "OtherOrg/OtherRepo",
},
expectedDebian: "0.100.0~branch~ferretdb",
expectedDebian: "0.100.0~ferretdb",
expectedDocker: &images{
developmentImages: []string{
"ghcr.io/otherorg/postgres-otherrepo-dev:17-ferretdb",
@@ -310,7 +310,7 @@ func TestDefineVersion(t *testing.T) {
"GITHUB_REF_TYPE": "branch",
"GITHUB_REPOSITORY": "FerretDB/documentdb",
},
expectedDebian: "0.100.0~branch~ferretdb",
expectedDebian: "0.100.0~ferretdb",
expectedDocker: &images{
developmentImages: []string{
"ferretdb/postgres-documentdb-dev:17-ferretdb",
@@ -328,7 +328,7 @@ func TestDefineVersion(t *testing.T) {
"GITHUB_REF_TYPE": "branch",
"GITHUB_REPOSITORY": "OtherOrg/OtherRepo",
},
expectedDebian: "0.100.0~branch~ferretdb",
expectedDebian: "0.100.0~ferretdb",
expectedDocker: &images{
developmentImages: []string{
"ghcr.io/otherorg/postgres-otherrepo-dev:17-ferretdb",