Skip to content

Commit

Permalink
Merge pull request #2753 from ActiveState/DX-2186
Browse files Browse the repository at this point in the history
Revert inclusion of build artifacts from event handling
  • Loading branch information
MDrakos authored Sep 15, 2023
2 parents 0177619 + 137921f commit 5731dea
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions pkg/platform/runtime/setup/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ func (s *Setup) fetchAndInstallArtifactsFromBuildPlan(installFunc artifactInstal
)

artifactsToInstall := []artifact.ArtifactID{}
buildtimeArtifacts := runtimeArtifacts
// buildtimeArtifacts := runtimeArtifacts
if buildResult.BuildReady {
// If the build is already done we can just look at the downloadable artifacts as they will be a fully accurate
// prediction of what we will be installing.
Expand All @@ -502,13 +502,6 @@ func (s *Setup) fetchAndInstallArtifactsFromBuildPlan(installFunc artifactInstal
artifactsToInstall = append(artifactsToInstall, a.ArtifactID)
}
}

// We also caclulate the artifacts to be built which includes more than the runtime artifacts.
// This is used to determine if we need to show the "build in progress" screen.
buildtimeArtifacts, err = buildplan.BuildtimeArtifacts(buildResult.Build, false)
if err != nil {
return nil, nil, errs.Wrap(err, "Could not get buildtime artifacts")
}
}

// The log file we want to use for builds
Expand All @@ -525,7 +518,7 @@ func (s *Setup) fetchAndInstallArtifactsFromBuildPlan(installFunc artifactInstal
ArtifactNames: artifactNames,
LogFilePath: logFilePath,
ArtifactsToBuild: func() []artifact.ArtifactID {
return artifact.ArtifactIDsFromBuildPlanMap(buildtimeArtifacts) // This does not account for cached builds
return artifact.ArtifactIDsFromBuildPlanMap(runtimeArtifacts) // This does not account for cached builds
}(),
// Yes these have the same value; this is intentional.
// Separating these out just allows us to be more explicit and intentional in our event handling logic.
Expand Down

0 comments on commit 5731dea

Please sign in to comment.