Skip to content

Only use buildContext when building packages #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 30, 2023
Merged

Only use buildContext when building packages #162

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions pkg/leeway/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,14 +456,14 @@ func Build(pkg *Package, opts ...BuildOption) (err error) {
pkgsToDownload = append(pkgsToDownload, p)
}

err = options.RemoteCache.Download(ctx.LocalCache, pkgsToDownload)
err = ctx.RemoteCache.Download(ctx.LocalCache, pkgsToDownload)
if err != nil {
return err
}

options.Reporter.BuildStarted(pkg, pkgstatus)
ctx.Reporter.BuildStarted(pkg, pkgstatus)
defer func(err *error) {
options.Reporter.BuildFinished(pkg, *err)
ctx.Reporter.BuildFinished(pkg, *err)
}(&err)

if len(unresolvedArgs) != 0 {
Expand All @@ -475,21 +475,21 @@ func Build(pkg *Package, opts ...BuildOption) (err error) {
return xerrors.Errorf(msg)
}

if options.BuildPlan != nil {
if ctx.BuildPlan != nil {
log.Debug("writing build plan")
err = writeBuildPlan(options.BuildPlan, pkg, pkgstatus)
err = writeBuildPlan(ctx.BuildPlan, pkg, pkgstatus)
if err != nil {
return err
}
}

if options.DryRun {
if ctx.DryRun {
// This is a dry-run. We've prepared everything for the build but do not execute the build itself.
return nil
}

buildErr := pkg.build(ctx)
cacheErr := options.RemoteCache.Upload(ctx.LocalCache, ctx.GetNewPackagesForCache())
cacheErr := ctx.RemoteCache.Upload(ctx.LocalCache, ctx.GetNewPackagesForCache())

if buildErr != nil {
// We deliberately swallow the target pacakge build error as that will have already been reported using the reporter.
Expand Down