Merge pull request ActiveState#3535 from ActiveState/version/0-46-0-RC2

Version 0.46.0-RC2

Author: Naatan

internal/runbits/dependencies/changesummary.go

@@ -68,6 +68,8 @@ func OutputChangeSummary(out output.Outputer, newBuildPlan *buildplan.BuildPlan,
 
 	dependencies = sliceutils.UniqueByProperty(dependencies, func(i *buildplan.Ingredient) any { return i.IngredientID })
 	directDependencies = sliceutils.UniqueByProperty(directDependencies, func(i *buildplan.Ingredient) any { return i.IngredientID })
+	// Duplicate entries may occur when multiple artifacts share common dependencies.
+	addedLocale = sliceutils.Unique(addedLocale)
 	commonDependencies := directDependencies.CommonRuntimeDependencies().ToIDMap()
 	numIndirect := len(dependencies) - len(directDependencies) - len(commonDependencies)
 

internal/runners/export/buildplan.go

@@ -39,14 +39,14 @@ func (b *BuildPlan) Run(params *BuildPlanParams) (rerr error) {
 		return errs.Wrap(err, "Could not get commit")
 	}
 
-	bytes, err := commit.BuildScript().MarshalBuildExpression()
+	bytes, err := commit.BuildPlan().Marshal()
 	if err != nil {
-		return errs.Wrap(err, "Could not marshal build expression")
+		return errs.Wrap(err, "Could not marshal build plan")
 	}
 	expr := make(map[string]interface{})
 	err = json.Unmarshal(bytes, &expr)
 	if err != nil {
-		return errs.Wrap(err, "Could not unmarshal build expression")
+		return errs.Wrap(err, "Could not unmarshal build plan")
 	}
 
 	out.Print(output.Prepare(string(bytes), expr))

test/integration/export_int_test.go

@@ -152,10 +152,8 @@ func (suite *ExportIntegrationTestSuite) TestExport_BuildPlan() {
 	cp := ts.Spawn("export", "buildplan")
 	cp.Expect("Resolving Dependencies")
 	cp.Expect(`{`)
-	cp.Expect(`"let":`)
-	cp.Expect(`"in":`)
-	cp.Expect(`"runtime":`)
-	cp.Expect(`"sources":`)
+	cp.Expect(`"buildPlanID":`)
+	cp.Expect(`"terminals":`)
 	cp.Expect(`}`)
 	cp.ExpectExitCode(0)
 }
@@ -198,7 +196,7 @@ func (suite *ExportIntegrationTestSuite) TestJSON() {
 	cp.Expect(`{"`)
 	cp.Expect(`}`)
 	cp.ExpectExitCode(0)
-	AssertValidJSON(suite.T(), cp)
+	// The buildplan is too large for the snapshot to contain valid JSON.
 }
 
 func TestExportIntegrationTestSuite(t *testing.T) {

version.txt

@@ -1 +1 @@
-0.46.0-RC1
+0.46.0-RC2