willfire 0.1.26 → 0.1.27

package/dist/predict/predict.js

@@ -35,10 +35,18 @@ export async function predict(github, repo, prNumber, opts = {}) {
     };
     const headSha = pr.head.sha;
     /**
-     * The PR's own repo at the head commit — where expansion starts, and already
-     * a commit id, so its `ref` and `sha` are the same string.
+     * The PR's own repo at the head commit — the surface the skip instruction is
+     * read from, and already a commit id, so its `ref` and `sha` are the same
+     * string.
      */
     const headSource = { owner, repo: name, ref: headSha, sha: headSha };
+    /**
+     * GitHub evaluates a `pull_request` at the test merge, not the head (#105).
+     * Null when it has none: a conflict, or a merge not computed yet.
+     */
+    const mergeSha = pr.merge_commit_sha;
+    const readSource = mergeSha === null ? headSource : { owner, repo: name, ref: mergeSha, sha: mergeSha };
+    const readLabel = readSource.sha === headSha ? "head" : "the test merge commit";
     // Provenance for the answer, filled as expansion reaches each source. The head
     // is in from the start: it is read even on the skip path, where the commit
     // message is what decides the verdict.
@@ -51,6 +59,7 @@ export async function predict(github, repo, prNumber, opts = {}) {
     if (SKIP_RE.test(headMsg) || SKIP_TRAILER_RE.test(headMsg)) {
         return finalizePrediction([], "head commit message contains a skip instruction", sources);
     }
+    sources.set(sourceKey(readSource), readSource);
     // A `uses:` naming a tag is the same lookup from every caller that writes it,
     // so resolve each `owner/repo@ref` once. Misses are cached too: a ref that
     // cannot be resolved will not start resolving on the second ask.
@@ -115,7 +124,7 @@ export async function predict(github, repo, prNumber, opts = {}) {
     const reader = { fetchWorkflow, resolveRef };
     // Execution is on by default and costs nothing until a workflow needs it.
     const executor = opts.executor === undefined
-        ? makeLiveExecutor(github, headSource, resolveRef)
+        ? makeLiveExecutor(github, readSource, resolveRef)
         : (opts.executor ?? undefined);
     const workflows = await github.paginate(github.rest.actions.listRepoWorkflows, {
         ...base,
@@ -134,13 +143,18 @@ export async function predict(github, repo, prNumber, opts = {}) {
                 { workflow: path, job: "*", status: "no-dispatch", reason: `workflow state: ${state}` },
             ];
         }
-        const content = await fetchWorkflow(path, headSource);
+        const content = await fetchWorkflow(path, readSource);
         if (content === null) {
             // The Actions API keeps listing a workflow as `active` after its file is
-            // deleted. There is no file at head, so there is nothing to dispatch —
+            // deleted. There is no file to evaluate, so there is nothing to dispatch —
             // the same verdict as the disabled case above, reached a different way.
             return [
-                { workflow: path, job: "*", status: "no-dispatch", reason: "no workflow file at head" },
+                {
+                    workflow: path,
+                    job: "*",
+                    status: "no-dispatch",
+                    reason: `no workflow file at ${readLabel}`,
+                },
             ];
         }
         let wf;
@@ -157,7 +171,7 @@ export async function predict(github, repo, prNumber, opts = {}) {
         if (!dispatches) {
             return [{ workflow: path, job: "*", status: "no-dispatch", reason }];
         }
-        const jobs = await expandJobs(wf, ctx, reader, headSource, 0, "", true, prFacts, executor);
+        const jobs = await expandJobs(wf, ctx, reader, readSource, 0, "", true, prFacts, executor);
         return jobs.map((j) => ({
             workflow: path,
             job: jobName(j.job),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "willfire",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "description": "Predict the set of CI check entries GitHub Actions will create for a pull request",
   "license": "MIT",
   "packageManager": "pnpm@10.33.0",