Do not force build-cache path creation if not needed

arduino · May 27, 2024 · 94b1983 · 94b1983
1 parent 8797c63
commit 94b1983
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/internal/arduino/builder/core.go b/internal/arduino/builder/core.go
@@ -109,11 +109,12 @@ func (b *Builder) compileCore() (*paths.Path, paths.PathList, error) {
 		}
 
 		// If there is an archived core in the current build cache, use it
-		if _, err := buildcache.New(b.coreBuildCachePath).GetOrCreate(archivedCoreName); errors.Is(err, buildcache.CreateDirErr) {
-			return nil, nil, errors.New(i18n.Tr("creating core cache folder: %s", err))
-		}
 		targetArchivedCore = b.coreBuildCachePath.Join(archivedCoreName, "core.a")
 		if canUseArchivedCore(targetArchivedCore) {
+			// Extend the build cache expiration time
+			if _, err := buildcache.New(b.coreBuildCachePath).GetOrCreate(archivedCoreName); errors.Is(err, buildcache.CreateDirErr) {
+				return nil, nil, errors.New(i18n.Tr("creating core cache folder: %s", err))
+			}
 			// use archived core
 			if b.logger.Verbose() {
 				b.logger.Info(i18n.Tr("Using precompiled core: %[1]s", targetArchivedCore))
@@ -133,6 +134,11 @@ func (b *Builder) compileCore() (*paths.Path, paths.PathList, error) {
 				return extraTargetArchivedCore, variantObjectFiles, nil
 			}
 		}
+
+		// Create the build cache folder for the core
+		if _, err := buildcache.New(b.coreBuildCachePath).GetOrCreate(archivedCoreName); errors.Is(err, buildcache.CreateDirErr) {
+			return nil, nil, errors.New(i18n.Tr("creating core cache folder: %s", err))
+		}
 	}
 
 	coreObjectFiles, err := b.compileFiles(