Commit 0710afa

author

Luca Bianconi

committed

fix: core cache non working

1 parent df1ec17 commit 0710afaCopy full SHA for 0710afa

File tree

3 files changed

+11

-9

lines changed

commands/compile
- compile.go
legacy/builder
- phases
  - core_builder.go
- test
  - builder_test.go

3 files changed

+11

-9

lines changed

`‎commands/compile/compile.go‎`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,6 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream`
`66`	`66`	`if lm == nil {`
`67`	`67`	`return nil, &arduino.InvalidInstanceError{}`
`68`	`68`	`}`
`69`		`- // cache is purged after compilation to not remove entries that might be required`
`70`		`- defer maybePurgeBuildCache()`
`71`	`69`
`72`	`70`	`logrus.Tracef("Compile %s for %s started", req.GetSketchPath(), req.GetFqbn())`
`73`	`71`	`if req.GetSketchPath() == "" {`
`@@ -138,6 +136,11 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream`
`138`	`136`	`if err = builderCtx.BuildPath.MkdirAll(); err != nil {`
`139`	`137`	`return nil, &arduino.PermissionDeniedError{Message: tr("Cannot create build directory"), Cause: err}`
`140`	`138`	`}`
	`139`	`+`
	`140`	`+ buildcache.Used(builderCtx.BuildPath)`
	`141`	`+ // cache is purged after compilation to not remove entries that might be required`
	`142`	`+ defer maybePurgeBuildCache()`
	`143`	`+`
`141`	`144`	`builderCtx.CompilationDatabase = bldr.NewCompilationDatabase(`
`142`	`145`	`builderCtx.BuildPath.Join("compile_commands.json"),`
`143`	`146`	`)`
`@@ -216,8 +219,6 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream`
`216`	`219`	`r.UsedLibraries = importedLibs`
`217`	`220`	`}()`
`218`	`221`
`219`		`- defer buildcache.Used(builderCtx.BuildPath)`
`220`		`-`
`221`	`222`	`// if it's a regular build, go on...`
`222`	`223`	`if err := builder.RunBuilder(builderCtx); err != nil {`
`223`	`224`	`return r, &arduino.CompileFailedError{Message: err.Error()}`

`‎legacy/builder/phases/core_builder.go‎`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,12 +92,10 @@ func compileCore(ctx types.Context, buildPath paths.Path, buildCachePath *path`
`92`	`92`	`realCoreFolder := coreFolder.Parent().Parent()`
`93`	`93`
`94`	`94`	`var targetArchivedCore *paths.Path`
`95`		`- var targetArchivedCoreDir *paths.Path`
`96`	`95`	`if buildCachePath != nil {`
`97`	`96`	`archivedCoreName := GetCachedCoreArchiveDirName(buildProperties.Get(constants.BUILD_PROPERTIES_FQBN),`
`98`	`97`	`buildProperties.Get("compiler.optimization_flags"), realCoreFolder)`
`99`		`- targetArchivedCoreDir = buildCachePath.Join(archivedCoreName)`
`100`		`- targetArchivedCore = targetArchivedCoreDir.Join("core.a")`
	`98`	`+ targetArchivedCore = buildCachePath.Join(archivedCoreName).Join("core.a")`
`101`	`99`	`canUseArchivedCore := !ctx.OnlyUpdateCompilationDatabase &&`
`102`	`100`	`!ctx.Clean &&`
`103`	`101`	`!builder_utils.CoreOrReferencedCoreHasChanged(realCoreFolder, targetCoreFolder, targetArchivedCore)`
`@@ -123,9 +121,9 @@ func compileCore(ctx types.Context, buildPath paths.Path, buildCachePath *path`
`123`	`121`
`124`	`122`	`// archive core.a`
`125`	`123`	`if targetArchivedCore != nil && !ctx.OnlyUpdateCompilationDatabase {`
`126`		`- defer buildcache.Used(targetArchivedCore)`
`127`		`- targetArchivedCoreDir.MkdirAll()`
	`124`	`+ targetArchivedCore.Parent().MkdirAll()`
`128`	`125`	`err := archiveFile.CopyTo(targetArchivedCore)`
	`126`	`+ buildcache.Used(targetArchivedCore.Parent())`
`129`	`127`	`if ctx.Verbose {`
`130`	`128`	`if err == nil {`
`131`	`129`	`ctx.Info(tr("Archiving built core (caching) in: %[1]s", targetArchivedCore))`

`‎legacy/builder/test/builder_test.go‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -384,6 +384,9 @@ func TestBuilderCacheCoreAFile(t *testing.T) {`
`384`	`384`	`cachedCoreFile := ctx.CoreBuildCachePath.Join(coreFileName, "core.a")`
`385`	`385`	`coreStatBefore, err := cachedCoreFile.Stat()`
`386`	`386`	`require.NoError(t, err)`
	`387`	`+ lastUsedFile := ctx.CoreBuildCachePath.Join(coreFileName, ".last-used")`
	`388`	`+ _, err = lastUsedFile.Stat()`
	`389`	`+ require.NoError(t, err)`
`387`	`390`
`388`	`391`	`// Run build again, to verify that the builder skips rebuilding core.a`
`389`	`392`	`err = bldr.Run(ctx)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 0710afa

File tree

3 files changed

3 files changed

`‎commands/compile/compile.go‎`

`‎legacy/builder/phases/core_builder.go‎`

`‎legacy/builder/test/builder_test.go‎`

0 commit comments