Skip to content

dh-make-golang make: directly use the user preferred tag specified in "-git_revision" option #227

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

dh-make-golang make: directly use the user preferred tag specified in "-git_revision" option #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion make.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ func makeUpstreamSourceTarball(repo, revision string, forcePrerelease bool) (*up

log.Printf("Determining upstream version number\n")

u.version, err = pkgVersionFromGit(repoDir, &u, forcePrerelease)
u.version, err = pkgVersionFromGit(repoDir, &u, revision, forcePrerelease)
if err != nil {
return nil, fmt.Errorf("get package version from Git: %w", err)
}
Expand Down
30 changes: 24 additions & 6 deletions version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"os"
"os/exec"
"regexp"
"slices"
"strconv"
"strings"
"time"
Expand All @@ -32,16 +33,33 @@ var (
// Besides returning the Debian upstream version, the "upstream" struct
// struct fields u.version, u.commitIsh, u.hasRelease and u.isRelease
// are also set.
// `preferredRev` should be empty if there are no user preferences.
// TODO: also support other VCS
func pkgVersionFromGit(gitdir string, u *upstream, forcePrerelease bool) (string, error) {
func pkgVersionFromGit(gitdir string, u *upstream, preferredRev string, forcePrerelease bool) (string, error) {
var latestTag string
var commitsAhead int

// Find @latest version tag (whether annotated or not)
cmd := exec.Command("git", "describe", "--abbrev=0", "--tags", "--exclude", "*/v*")
cmd.Dir = gitdir
if out, err := cmd.Output(); err == nil {
latestTag = strings.TrimSpace(string(out))
var cmd *exec.Cmd // the temporary shell commands we execute

// If the user specifies a valid tag as the preferred revision, that tag should be used without additional heuristics.
if u.rr != nil {
if out, err := u.rr.VCS.Tags(gitdir); err == nil && slices.Contains(out, preferredRev) {
latestTag = preferredRev
}
}

// Find @latest version tag (whether annotated or not) when the user
// (1) does not specify a version tag, or
// (2) specifies an invalid version tag.
if len(latestTag) == 0 {
cmd = exec.Command("git", "describe", "--abbrev=0", "--tags", "--exclude", "*/v*")
cmd.Dir = gitdir
if out, err := cmd.Output(); err == nil {
latestTag = strings.TrimSpace(string(out))
}
}

if len(latestTag) > 0 {
u.hasRelease = true
u.tag = latestTag
log.Printf("Found latest tag %q", latestTag)
Expand Down
8 changes: 4 additions & 4 deletions version_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func TestSnapshotVersion(t *testing.T) {
}

var u upstream
got, err := pkgVersionFromGit(tempdir, &u, false)
got, err := pkgVersionFromGit(tempdir, &u, "", false)
if err != nil {
t.Fatalf("Determining package version from git failed: %v", err)
}
Expand All @@ -55,7 +55,7 @@ func TestSnapshotVersion(t *testing.T) {

gitCmdOrFatal(t, tempdir, "tag", "-a", "v1", "-m", "release v1")

got, err = pkgVersionFromGit(tempdir, &u, false)
got, err = pkgVersionFromGit(tempdir, &u, "", false)
if err != nil {
t.Fatalf("Determining package version from git failed: %v", err)
}
Expand All @@ -75,7 +75,7 @@ func TestSnapshotVersion(t *testing.T) {
t.Fatalf("Could not run %v: %v", cmd.Args, err)
}

got, err = pkgVersionFromGit(tempdir, &u, false)
got, err = pkgVersionFromGit(tempdir, &u, "", false)
if err != nil {
t.Fatalf("Determining package version from git failed: %v", err)
}
Expand All @@ -95,7 +95,7 @@ func TestSnapshotVersion(t *testing.T) {
t.Fatalf("Could not run %v: %v", cmd.Args, err)
}

got, err = pkgVersionFromGit(tempdir, &u, false)
got, err = pkgVersionFromGit(tempdir, &u, "", false)
if err != nil {
t.Fatalf("Determining package version from git failed: %v", err)
}
Expand Down
Loading