Merge branch 'master' into pr/Fix815

microsoft · Jan 9, 2025 · f6b6c4d · f6b6c4d
2 parents 26a4440 + 211cdcb
commit f6b6c4d
Show file tree

Hide file tree

Showing 13 changed files with 152 additions and 14 deletions.
diff --git a/packages/cli/CHANGELOG.json b/packages/cli/CHANGELOG.json
@@ -1,6 +1,36 @@
 {
   "name": "@lage-run/cli",
   "entries": [
+    {
+      "date": "Fri, 20 Dec 2024 19:42:00 GMT",
+      "version": "0.24.10",
+      "tag": "@lage-run/cli_v0.24.10",
+      "comments": {
+        "patch": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/cli",
+            "commit": "f4de24eb3e7968b547590e7e66a3f2929e4d26cf",
+            "comment": "adds the directory probing as well"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 19 Dec 2024 15:53:46 GMT",
+      "version": "0.24.9",
+      "tag": "@lage-run/cli_v0.24.9",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@lage-run/cli",
+            "comment": "Bump @lage-run/scheduler to v1.4.3",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Tue, 10 Dec 2024 23:38:54 GMT",
       "version": "0.24.8",

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,9 +1,25 @@
 # Change Log - @lage-run/cli
 
-<!-- This log was last generated on Tue, 10 Dec 2024 23:38:54 GMT and should not be manually modified. -->
+<!-- This log was last generated on Fri, 20 Dec 2024 19:42:00 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
+## 0.24.10
+
+Fri, 20 Dec 2024 19:42:00 GMT
+
+### Patches
+
+- adds the directory probing as well (kchau@microsoft.com)
+
+## 0.24.9
+
+Thu, 19 Dec 2024 15:53:46 GMT
+
+### Patches
+
+- Bump @lage-run/scheduler to v1.4.3
+
 ## 0.24.8
 
 Tue, 10 Dec 2024 23:38:54 GMT

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/cli",
-  "version": "0.24.8",
+  "version": "0.24.10",
   "description": "Command Line Interface for Lage",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "@lage-run/reporters": "^1.2.18",
     "@lage-run/rpc": "^1.2.3",
     "@lage-run/runners": "^1.2.0",
-    "@lage-run/scheduler": "^1.4.2",
+    "@lage-run/scheduler": "^1.4.3",
     "@lage-run/scheduler-types": "^0.3.22",
     "@lage-run/target-graph": "^0.11.0",
     "@lage-run/worker-threads-pool": "^0.8.6",

diff --git a/packages/cli/src/commands/exec/simulateFileAccess.ts b/packages/cli/src/commands/exec/simulateFileAccess.ts
@@ -7,20 +7,40 @@ export async function simulateFileAccess(logger: Logger, inputs: string[], outpu
   const root = getWorkspaceRoot(process.cwd())!;
   logger.silly("Now probing and touching inputs and outputs");
 
+  const inputDirectories = new Set<string>();
+
   // probe input files
   let fd: number;
   for (const input of inputs) {
     fd = fs.openSync(path.join(root, input), "r");
     fs.closeSync(fd);
+
+    inputDirectories.add(path.dirname(input));
+  }
+
+  for (const directory of inputDirectories) {
+    fd = fs.openSync(path.join(root, directory), "r");
+    fs.closeSync(fd);
   }
 
   // touch output files
   const time = new Date();
+  const outputDirectories = new Set<string>();
   for (const output of outputs) {
+    outputDirectories.add(path.dirname(output));
+
     try {
       fs.utimesSync(path.join(root, output), time, time);
     } catch (e) {
       // ignore
     }
   }
+
+  for (const directory of outputDirectories) {
+    try {
+      fs.utimesSync(path.join(root, directory), time, time);
+    } catch (e) {
+      // ignore
+    }
+  }
 }
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
@@ -19,7 +19,7 @@
     "lint": "monorepo-scripts lint"
   },
   "dependencies": {
-    "@lage-run/cli": "^0.24.8",
+    "@lage-run/cli": "^0.24.10",
     "@lage-run/globby": "^14.2.0",
     "@lage-run/monorepo-scripts": "*",
     "@lage-run/scheduler-types": "^0.3.22",

diff --git a/packages/lage/CHANGELOG.json b/packages/lage/CHANGELOG.json
@@ -1,6 +1,36 @@
 {
   "name": "lage",
   "entries": [
+    {
+      "date": "Fri, 20 Dec 2024 19:42:00 GMT",
+      "version": "2.12.6",
+      "tag": "lage_v2.12.6",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "lage",
+            "comment": "Bump @lage-run/cli to v0.24.10",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 19 Dec 2024 15:53:46 GMT",
+      "version": "2.12.5",
+      "tag": "lage_v2.12.5",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "lage",
+            "comment": "Bump @lage-run/cli to v0.24.9",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Tue, 10 Dec 2024 23:38:54 GMT",
       "version": "2.12.4",

diff --git a/packages/lage/CHANGELOG.md b/packages/lage/CHANGELOG.md
@@ -1,9 +1,25 @@
 # Change Log - lage
 
-<!-- This log was last generated on Tue, 10 Dec 2024 23:38:54 GMT and should not be manually modified. -->
+<!-- This log was last generated on Fri, 20 Dec 2024 19:42:00 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
+## 2.12.6
+
+Fri, 20 Dec 2024 19:42:00 GMT
+
+### Patches
+
+- Bump @lage-run/cli to v0.24.10
+
+## 2.12.5
+
+Thu, 19 Dec 2024 15:53:46 GMT
+
+### Patches
+
+- Bump @lage-run/cli to v0.24.9
+
 ## 2.12.4
 
 Tue, 10 Dec 2024 23:38:54 GMT

diff --git a/packages/lage/package.json b/packages/lage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lage",
-  "version": "2.12.4",
+  "version": "2.12.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/microsoft/lage"
@@ -23,7 +23,7 @@
     "fsevents": "~2.3.2"
   },
   "devDependencies": {
-    "@lage-run/cli": "^0.24.8",
+    "@lage-run/cli": "^0.24.10",
     "@lage-run/runners": "^1.2.0",
     "backfill-config": "6.4.2",
     "dts-bundle-generator": "^9.5.1",

diff --git a/packages/scheduler/CHANGELOG.json b/packages/scheduler/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@lage-run/scheduler",
   "entries": [
+    {
+      "date": "Thu, 19 Dec 2024 15:53:46 GMT",
+      "version": "1.4.3",
+      "tag": "@lage-run/scheduler_v1.4.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "1581488+christiango@users.noreply.github.com",
+            "package": "@lage-run/scheduler",
+            "commit": "684d1b6f3686b38d198541850345485b14bea318",
+            "comment": "Report the correct percentage for progress logger up front instead of only adding tasks after they start running"
+          }
+        ]
+      }
+    },
     {
       "date": "Sun, 08 Dec 2024 00:07:28 GMT",
       "version": "1.4.2",

diff --git a/packages/scheduler/CHANGELOG.md b/packages/scheduler/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Change Log - @lage-run/scheduler
 
-<!-- This log was last generated on Sun, 08 Dec 2024 00:07:28 GMT and should not be manually modified. -->
+<!-- This log was last generated on Thu, 19 Dec 2024 15:53:46 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
+## 1.4.3
+
+Thu, 19 Dec 2024 15:53:46 GMT
+
+### Patches
+
+- Report the correct percentage for progress logger up front instead of only adding tasks after they start running (1581488+christiango@users.noreply.github.com)
+
 ## 1.4.2
 
 Sun, 08 Dec 2024 00:07:28 GMT

diff --git a/packages/scheduler/package.json b/packages/scheduler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/scheduler",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "Scheduler for Lage",
   "repository": {
     "type": "git",

diff --git a/packages/scheduler/src/WrappedTarget.ts b/packages/scheduler/src/WrappedTarget.ts
@@ -80,11 +80,14 @@ export class WrappedTarget implements TargetRun<WorkerResult> {
     if (this.target.id === getStartTargetId()) {
       this.#status = "success";
     }
+
+    this.options.logger.info("", { target: this.target, status: this.status });
   }
 
   onQueued() {
     this.#status = "queued";
     this.queueTime = process.hrtime();
+    this.options.logger.info("", { target: this.target, status: "queued" });
   }
 
   onAbort() {

diff --git a/yarn.lock b/yarn.lock
@@ -1697,7 +1697,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@lage-run/cli@npm:^0.24.8, @lage-run/cli@workspace:packages/cli":
+"@lage-run/cli@npm:^0.24.10, @lage-run/cli@workspace:packages/cli":
   version: 0.0.0-use.local
   resolution: "@lage-run/cli@workspace:packages/cli"
   dependencies:
@@ -1712,7 +1712,7 @@ __metadata:
     "@lage-run/reporters": "npm:^1.2.18"
     "@lage-run/rpc": "npm:^1.2.3"
     "@lage-run/runners": "npm:^1.2.0"
-    "@lage-run/scheduler": "npm:^1.4.2"
+    "@lage-run/scheduler": "npm:^1.4.3"
     "@lage-run/scheduler-types": "npm:^0.3.22"
     "@lage-run/target-graph": "npm:^0.11.0"
     "@lage-run/worker-threads-pool": "npm:^0.8.6"
@@ -1751,7 +1751,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@lage-run/e2e-tests@workspace:packages/e2e-tests"
   dependencies:
-    "@lage-run/cli": "npm:^0.24.8"
+    "@lage-run/cli": "npm:^0.24.10"
     "@lage-run/globby": "npm:^14.2.0"
     "@lage-run/monorepo-scripts": "npm:*"
     "@lage-run/scheduler-types": "npm:^0.3.22"
@@ -1901,7 +1901,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@lage-run/scheduler@npm:^1.4.2, @lage-run/scheduler@workspace:packages/scheduler":
+"@lage-run/scheduler@npm:^1.4.3, @lage-run/scheduler@workspace:packages/scheduler":
   version: 0.0.0-use.local
   resolution: "@lage-run/scheduler@workspace:packages/scheduler"
   dependencies:
@@ -6108,7 +6108,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "lage@workspace:packages/lage"
   dependencies:
-    "@lage-run/cli": "npm:^0.24.8"
+    "@lage-run/cli": "npm:^0.24.10"
     "@lage-run/runners": "npm:^1.2.0"
     backfill-config: "npm:6.4.2"
     dts-bundle-generator: "npm:^9.5.1"