Minor fixes

filiptronicek · filiptronicek · commit 2b081169d4ca · 2024-11-12T16:13:53.000Z
diff --git a/components/server/src/prebuilds/incremental-workspace-service.ts b/components/server/src/prebuilds/incremental-workspace-service.ts
@@ -171,6 +171,10 @@ export class IncrementalWorkspaceService {
 
         // ensure the image source hasn't changed (skips older images)
         if (JSON.stringify(imageSource) !== JSON.stringify(candidateWorkspace.imageSource)) {
+            log.debug(`Skipping parent prebuild: Outdated image`, {
+                imageSource,
+                parentImageSource: candidateWorkspace.imageSource,
+            });
             return false;
         }
 
diff --git a/components/server/src/workspace/context-service.spec.db.ts b/components/server/src/workspace/context-service.spec.db.ts
@@ -590,7 +590,7 @@ describe("ContextService", async () => {
 
         const prebuildForCommit1 = await prebuildManager.startPrebuild(
             {},
-            { user: owner, project, commitInfo: commit1, context: ctx1.context as CommitContext, forcePrebuild: true },
+            { user: owner, project, commitInfo: commit1, context: ctx1.context as CommitContext },
         );
         const prebuild2 = await workspaceDb.findPrebuildByID(prebuildForCommit1.prebuildId);
         await workspaceDb.storePrebuiltWorkspace({

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,10 @@ export class IncrementalWorkspaceService {`
`171`	`171`
`172`	`172`	`// ensure the image source hasn't changed (skips older images)`
`173`	`173`	`if (JSON.stringify(imageSource) !== JSON.stringify(candidateWorkspace.imageSource)) {`
	`174`	+ log.debug(`Skipping parent prebuild: Outdated image`, {
	`175`	`+ imageSource,`
	`176`	`+ parentImageSource: candidateWorkspace.imageSource,`
	`177`	`+ });`
`174`	`178`	`return false;`
`175`	`179`	`}`
`176`	`180`