fix: improve version handling and changelog generation using semantic versioning

Author: shyim

cmd/project/project_extension_upload.go

@@ -185,7 +185,7 @@ var projectExtensionUploadCmd = &cobra.Command{
 			}
 		}
 
-		logging.FromContext(cmd.Context()).Infof("Uploaded extension %s with version %s", name, version)
+		logging.FromContext(cmd.Context()).Infof("Uploaded extension %s with version %s", name, version.String())
 
 		if _, err := client.ExtensionManager.Refresh(adminCtx); err != nil {
 			return fmt.Errorf("cannot refresh extension list: %w", err)

extension/bundle_test.go

@@ -89,7 +89,7 @@ func TestCreateBundle(t *testing.T) {
 
 	version, err := bundle.GetVersion()
 	assert.NoError(t, err)
-	assert.Equal(t, "1.0.0.0", version.String())
+	assert.Equal(t, "1.0.0", version.String())
 
 	// does notthing
 	bundle.Validate(getTestContext(), &ValidationContext{})

extension/zip.go

@@ -521,14 +521,16 @@ func PrepareExtensionForRelease(ctx context.Context, sourceRoot, extensionRoot s
 	if ext.GetExtensionConfig().Changelog.Enabled {
 		v, _ := ext.GetVersion()
 
-		logging.FromContext(ctx).Infof("Generated changelog for version %s", v.Original())
+		logging.FromContext(ctx).Infof("Generated changelog for version %s", v.String())
 
-		content, err := changelog.GenerateChangelog(ctx, v.Original(), sourceRoot, ext.GetExtensionConfig().Changelog)
+		content, err := changelog.GenerateChangelog(ctx, v.String(), sourceRoot, ext.GetExtensionConfig().Changelog)
 		if err != nil {
 			return err
 		}
 
-		changelogFile := fmt.Sprintf("# %s\n%s", v.Original(), content)
+		changelogFile := fmt.Sprintf("# %s\n%s", v.String(), content)
+
+		logging.FromContext(ctx).Debugf("Changelog:\n%s", changelogFile)
 
 		if err := os.WriteFile(path.Join(extensionRoot, "CHANGELOG_en-GB.md"), []byte(changelogFile), os.ModePerm); err != nil {
 			return err

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/joho/godotenv v1.5.1
 	github.com/microcosm-cc/bluemonday v1.0.27
 	github.com/otiai10/copy v1.14.1
-	github.com/shyim/go-version v0.0.0-20250514104457-ded98488bd6f
+	github.com/shyim/go-version v0.0.0-20250514132108-aa2854d2c40b
 	github.com/spf13/cobra v1.9.1
 	github.com/stretchr/testify v1.10.0
 	github.com/tetratelabs/wazero v1.9.0

go.sum

@@ -142,6 +142,10 @@ github.com/shyim/go-version v0.0.0-20250513054659-15e244b52011 h1:Fv97bFEM3NPyDW
 github.com/shyim/go-version v0.0.0-20250513054659-15e244b52011/go.mod h1:z47ygE4N7EC0H58FP5j5cXZtl1pSnfjwYJsHtiVtcwU=
 github.com/shyim/go-version v0.0.0-20250514104457-ded98488bd6f h1:0zgN0ZKq9EmT7sL0MEn9V70rGiwkj78Vv1WD0xmys8c=
 github.com/shyim/go-version v0.0.0-20250514104457-ded98488bd6f/go.mod h1:z47ygE4N7EC0H58FP5j5cXZtl1pSnfjwYJsHtiVtcwU=
+github.com/shyim/go-version v0.0.0-20250514131704-4ce943532a2c h1:gJ1D2/OkhbH/TOFffIx42cSBAF2qbuJ0JXlDr4zljrM=
+github.com/shyim/go-version v0.0.0-20250514131704-4ce943532a2c/go.mod h1:z47ygE4N7EC0H58FP5j5cXZtl1pSnfjwYJsHtiVtcwU=
+github.com/shyim/go-version v0.0.0-20250514132108-aa2854d2c40b h1:BBiMTvsse8YOfQuP/bFqxJjeqhkJtY1M0ZlGiwP5xtA=
+github.com/shyim/go-version v0.0.0-20250514132108-aa2854d2c40b/go.mod h1:z47ygE4N7EC0H58FP5j5cXZtl1pSnfjwYJsHtiVtcwU=
 github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
 github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=

internal/git/git.go

@@ -6,9 +6,11 @@ import (
 	"os"
 	"os/exec"
 	"path"
+	"sort"
 	"strings"
 
 	"github.com/shopware/shopware-cli/logging"
+	"github.com/shyim/go-version"
 )
 
 type GitCommit struct {
@@ -34,44 +36,56 @@ func runGit(ctx context.Context, repo string, args ...string) (string, error) {
 }
 
 func getPreviousTag(ctx context.Context, currentTag, repo string) (string, error) {
-	if err := unshallowRepository(ctx, repo); err != nil {
-		return "", err
-	}
-
 	previousVersion := os.Getenv("SHOPWARE_CLI_PREVIOUS_TAG")
 	if previousVersion != "" {
 		return previousVersion, nil
 	}
 
-	commits, err := runGit(ctx, repo, "log", "--pretty=format:%h", "--no-merges")
+	tags, err := runGit(ctx, repo, "tag", "--list")
 	if err != nil {
-		return "", fmt.Errorf("cannot get previous tag: %w", err)
+		return "", fmt.Errorf("failed to run git command: %w", err)
 	}
 
-	commitsArray := strings.Split(commits, "\n")
-	for commit := range commitsArray {
-		contains, err := runGit(ctx, repo, "tag", "--contains", commitsArray[commit])
-		if err != nil {
-			return "", fmt.Errorf("cannot get previous tag: %w", err)
-		}
+	// direct tag match
+	tagsArray := strings.Split(tags, "\n")
+
+	var tagList []*version.Version
 
-		if contains == "" {
+	for _, tag := range tagsArray {
+		v, err := version.NewVersion(tag)
+		if err != nil {
 			continue
 		}
 
-		matchingTags := strings.Split(contains, "\n")
+		tagList = append(tagList, v)
+	}
 
-		if len(matchingTags) == 0 {
-			continue
+	currentVersion := version.Must(version.NewVersion(currentTag))
+
+	sort.Sort(sort.Reverse(version.Collection(tagList)))
+
+	// same major version
+	currentMajor := currentVersion.Segments()[0]
+	for _, tag := range tagList {
+		if tag.Segments()[0] == currentMajor && tag.LessThan(currentVersion) {
+			return tag.String(), nil
 		}
+	}
 
-		if matchingTags[0] == currentTag {
-			continue
+	// Look at previous major version
+	for _, tag := range tagList {
+		if tag.Segments()[0] == currentMajor-1 {
+			return tag.String(), nil
 		}
+	}
 
-		return matchingTags[0], nil
+	commits, err := runGit(ctx, repo, "log", "--pretty=format:%h", "--no-merges")
+	if err != nil {
+		return "", fmt.Errorf("cannot get previous tag: %w", err)
 	}
 
+	commitsArray := strings.Split(commits, "\n")
+
 	// if no tag was found, return the first commit
 	return commitsArray[len(commitsArray)-1], nil
 }
@@ -94,6 +108,7 @@ func GetCommits(ctx context.Context, currentVersion, repo string) ([]GitCommit,
 	}
 
 	logging.FromContext(ctx).Debugf("Previous tag: %s", previousTag)
+	logging.FromContext(ctx).Debugf("Diffing %s..HEAD", previousTag)
 
 	commits, err := runGit(ctx, repo, "log", "--pretty=format:%h|%s", previousTag+"..HEAD", "--no-merges")
 	if err != nil {
@@ -142,7 +157,7 @@ func getTagForVersion(ctx context.Context, version, repo string) (string, error)
 		}
 	}
 
-	return "", nil
+	return version, nil
 }
 
 func GetPublicVCSURL(ctx context.Context, repo string) (string, error) {

internal/git/git_test.go

@@ -25,15 +25,15 @@ func TestNoTags(t *testing.T) {
 	runCommand(t, tmpDir, "add", "a")
 	runCommand(t, tmpDir, "commit", "-m", "initial commit", "--no-verify", "--no-gpg-sign")
 
-	tag, err := getPreviousTag(t.Context(), "", tmpDir)
+	tag, err := getPreviousTag(t.Context(), "1.0.0", tmpDir)
 	assert.NoError(t, err)
 	assert.NotEmpty(t, tag)
 
 	currentTag, err := getTagForVersion(t.Context(), "1.0.0", tmpDir)
 	assert.NoError(t, err)
-	assert.Equal(t, "", currentTag)
+	assert.Equal(t, "1.0.0", currentTag)
 
-	commits, err := GetCommits(t.Context(), "", tmpDir)
+	commits, err := GetCommits(t.Context(), "1.0.0", tmpDir)
 	assert.NoError(t, err)
 	assert.Len(t, commits, 0)
 }
@@ -49,15 +49,15 @@ func TestWithOneTagAndCommit(t *testing.T) {
 	runCommand(t, tmpDir, "add", "b")
 	runCommand(t, tmpDir, "commit", "-m", "second commit", "--no-verify", "--no-gpg-sign")
 
-	tag, err := getPreviousTag(t.Context(), "", tmpDir)
+	tag, err := getPreviousTag(t.Context(), "1.0.0", tmpDir)
 	assert.NoError(t, err)
-	assert.Equal(t, tag, "v1.0.0")
+	assert.NotEqual(t, tag, "v1.0.0")
 
 	currentTag, err := getTagForVersion(t.Context(), "1.0.0", tmpDir)
 	assert.NoError(t, err)
 	assert.Equal(t, "1.0.0", currentTag)
 
-	commits, err := GetCommits(t.Context(), "", tmpDir)
+	commits, err := GetCommits(t.Context(), "1.0.0", tmpDir)
 	assert.NoError(t, err)
 	assert.Len(t, commits, 1)
 	assert.Equal(t, commits[0].Message, "second commit")