Merge pull request #1117 from shopware/fix/extension-zip-head-not-newest-tag

fix: package HEAD instead of newest repo tag in extension zip

Author: shyim

internal/extension/git.go

@@ -12,7 +12,11 @@ import (
 )
 
 func gitTagOrBranchOfFolder(ctx context.Context, source string) (string, error) {
-	tagCmd := exec.CommandContext(ctx, "git", "-C", source, "tag", "--sort=-creatordate")
+	// Prefer a tag that points exactly at HEAD. This keeps the resulting filename
+	// in sync with the actually checked-out commit (e.g. when a CI pipeline builds
+	// a specific tag in detached-HEAD state). Picking the newest tag in the repo
+	// regardless of HEAD would package the wrong tree (see issue #1116 / #753).
+	tagCmd := exec.CommandContext(ctx, "git", "-C", source, "tag", "--points-at", "HEAD", "--sort=-creatordate")
 
 	stdout, err := tagCmd.Output()
 	if err != nil {

internal/extension/git_test.go

@@ -0,0 +1,97 @@
+package extension
+
+import (
+	"os"
+	"os/exec"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func gitRun(t *testing.T, dir string, args ...string) {
+	t.Helper()
+	cmd := exec.CommandContext(t.Context(), "git", append([]string{"-C", dir}, args...)...)
+	cmd.Env = append(os.Environ(),
+		"GIT_AUTHOR_NAME=test",
+		"GIT_AUTHOR_EMAIL=test@example.com",
+		"GIT_COMMITTER_NAME=test",
+		"GIT_COMMITTER_EMAIL=test@example.com",
+	)
+	out, err := cmd.CombinedOutput()
+	require.NoError(t, err, "git %v: %s", args, string(out))
+}
+
+func writeComposerJSON(t *testing.T, dir, content string) {
+	t.Helper()
+	require.NoError(t, os.WriteFile(filepath.Join(dir, "composer.json"), []byte(content), 0o644))
+}
+
+func TestGitCopyFolderArchivesHeadNotNewestTag(t *testing.T) {
+	source := t.TempDir()
+	ctx := t.Context()
+
+	gitRun(t, source, "init")
+	gitRun(t, source, "config", "commit.gpgsign", "false")
+	gitRun(t, source, "config", "tag.gpgSign", "false")
+	gitRun(t, source, "config", "tag.forceSignAnnotated", "false")
+
+	// Older release 1.0.0
+	writeComposerJSON(t, source, `{"version":"1.0.0"}`)
+	gitRun(t, source, "add", ".")
+	gitRun(t, source, "commit", "-m", "1.0.0")
+
+	// Current release 2.0.0 on HEAD
+	writeComposerJSON(t, source, `{"version":"2.0.0"}`)
+	gitRun(t, source, "add", ".")
+	gitRun(t, source, "commit", "-m", "2.0.0")
+	gitRun(t, source, "tag", "-a", "-m", "2.0.0", "2.0.0")
+
+	// Tag the older commit *after* the newer one, so a -creatordate sort over all
+	// tags would surface 1.0.0 first - the regression from issue #1116.
+	gitRun(t, source, "tag", "-a", "-m", "1.0.0", "1.0.0", "HEAD~1")
+
+	target := t.TempDir()
+
+	tag, err := GitCopyFolder(ctx, source, target, "")
+	require.NoError(t, err)
+
+	assert.Equal(t, "2.0.0", tag)
+
+	content, err := os.ReadFile(filepath.Join(target, "composer.json"))
+	require.NoError(t, err)
+	assert.Equal(t, `{"version":"2.0.0"}`, string(content))
+}
+
+func TestGitCopyFolderFallsBackToBranchWithoutTagAtHead(t *testing.T) {
+	source := t.TempDir()
+	ctx := t.Context()
+
+	gitRun(t, source, "init")
+	gitRun(t, source, "config", "commit.gpgsign", "false")
+	gitRun(t, source, "config", "tag.gpgSign", "false")
+	gitRun(t, source, "config", "tag.forceSignAnnotated", "false")
+	gitRun(t, source, "checkout", "-b", "main")
+
+	writeComposerJSON(t, source, `{"version":"1.0.0"}`)
+	gitRun(t, source, "add", ".")
+	gitRun(t, source, "commit", "-m", "1.0.0")
+	gitRun(t, source, "tag", "-a", "-m", "1.0.0", "1.0.0")
+
+	// New unreleased commit on top of the tag - no tag points at HEAD.
+	writeComposerJSON(t, source, `{"version":"1.0.1"}`)
+	gitRun(t, source, "add", ".")
+	gitRun(t, source, "commit", "-m", "wip")
+
+	target := t.TempDir()
+
+	tag, err := GitCopyFolder(ctx, source, target, "")
+	require.NoError(t, err)
+
+	assert.Equal(t, "main", tag)
+
+	content, err := os.ReadFile(filepath.Join(target, "composer.json"))
+	require.NoError(t, err)
+	assert.Equal(t, `{"version":"1.0.1"}`, string(content))
+}