[main] Bugfix for Independent Agent version parsing (#4412)

dwhyrock · web-flow · commit 437901ded669 · 2024-03-13T20:34:32.000Z
* Use proper version from manifest

* temp set branch to main for testing PR

* remove temp test env var
diff --git a/dev-tools/mage/manifest/manifest.go b/dev-tools/mage/manifest/manifest.go
@@ -106,7 +106,9 @@ func DownloadComponentsFromManifest(manifest string, platforms []string, platfor
 	}
 
 	// For resolving manifest package name and version, just use the Major.Minor.Patch part of the version
-	majorMinorPatchVersion := fmt.Sprintf("%d.%d.%d", parsedManifestVersion.Major(), parsedManifestVersion.Minor(), parsedManifestVersion.Patch())
+	// for Staging builds, and Major.Minor.Patch-SNAPSHOT for snapshots.
+	// This eliminates the "+buildYYYYMMDDHHMM" suffix on Independent Agent Release builds
+	majorMinorPatchVersion := parsedManifestVersion.VersionWithPrerelease()
 
 	errGrp, downloadsCtx := errgroup.WithContext(context.Background())
 	for component, pkgs := range componentSpec {

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,9 @@ func DownloadComponentsFromManifest(manifest string, platforms []string, platfor`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`// For resolving manifest package name and version, just use the Major.Minor.Patch part of the version`
`109`		`- majorMinorPatchVersion := fmt.Sprintf("%d.%d.%d", parsedManifestVersion.Major(), parsedManifestVersion.Minor(), parsedManifestVersion.Patch())`
	`109`	`+ // for Staging builds, and Major.Minor.Patch-SNAPSHOT for snapshots.`
	`110`	`+ // This eliminates the "+buildYYYYMMDDHHMM" suffix on Independent Agent Release builds`
	`111`	`+ majorMinorPatchVersion := parsedManifestVersion.VersionWithPrerelease()`
`110`	`112`
`111`	`113`	`errGrp, downloadsCtx := errgroup.WithContext(context.Background())`
`112`	`114`	`for component, pkgs := range componentSpec {`