@argos-ci/core 3.1.1 → 3.2.0

package/dist/index.js

@@ -6,6 +6,24 @@ import convict from "convict";
 
 // src/ci-environment/git.ts
 import { execSync } from "node:child_process";
+
+// src/debug.ts
+import createDebug from "debug";
+var KEY = "@argos-ci/core";
+var debug = createDebug(KEY);
+var isDebugEnabled = createDebug.enabled(KEY);
+var debugTime = (arg) => {
+  if (isDebugEnabled) {
+    console.time(arg);
+  }
+};
+var debugTimeEnd = (arg) => {
+  if (isDebugEnabled) {
+    console.timeEnd(arg);
+  }
+};
+
+// src/ci-environment/git.ts
 function checkIsGitRepository() {
   try {
     return execSync("git rev-parse --is-inside-work-tree").toString().trim() === "true";
@@ -32,18 +50,14 @@ function branch() {
   }
 }
 function getMergeBaseCommitShaWithDepth(input) {
-  try {
-    execSync(
-      `git fetch --update-head-ok --depth ${input.depth} origin ${input.head}:${input.head}`
-    );
-    execSync(
-      `git fetch --update-head-ok --depth ${input.depth} origin ${input.base}:${input.base}`
-    );
-    const mergeBase = execSync(`git merge-base ${input.head} ${input.base}`).toString().trim();
-    return mergeBase || null;
-  } catch {
-    return null;
-  }
+  execSync(
+    `git fetch --update-head-ok --depth ${input.depth} origin ${input.head}:${input.head}`
+  );
+  execSync(
+    `git fetch --update-head-ok --depth ${input.depth} origin ${input.base}:${input.base}`
+  );
+  const mergeBase = execSync(`git merge-base ${input.head} ${input.base}`).toString().trim();
+  return mergeBase || null;
 }
 function getMergeBaseCommitSha(input) {
   let depth = 200;
@@ -57,17 +71,31 @@ function getMergeBaseCommitSha(input) {
     }
     depth += 200;
   }
+  if (isDebugEnabled) {
+    const headShas = listShas(input.head);
+    const baseShas = listShas(input.base);
+    debug(
+      `No merge base found for ${input.head} and ${input.base} with depth ${depth}`
+    );
+    debug(
+      `Found ${headShas.length} commits in ${input.head}: ${headShas.join(", ")}`
+    );
+    debug(
+      `Found ${baseShas.length} commits in ${input.base}: ${baseShas.join(", ")}`
+    );
+  }
   return null;
 }
+function listShas(path, maxCount) {
+  const maxCountArg = maxCount ? `--max-count=${maxCount}` : "";
+  const raw = execSync(`git log --format="%H" ${maxCountArg} ${path}`.trim());
+  const shas = raw.toString().trim().split("\n");
+  return shas;
+}
 function listParentCommits(input) {
-  try {
-    execSync(`git fetch --depth=200 origin ${input.sha}`);
-    const raw = execSync(`git log --format="%H" --max-count=200 ${input.sha}`);
-    const shas = raw.toString().trim().split("\n");
-    return shas;
-  } catch {
-    return null;
-  }
+  const limit = 200;
+  execSync(`git fetch --depth=${limit} origin ${input.sha}`);
+  return listShas(input.sha, limit);
 }
 
 // src/ci-environment/services/bitrise.ts
@@ -150,25 +178,6 @@ var heroku_default = service3;
 // src/ci-environment/services/github-actions.ts
 import { existsSync, readFileSync } from "node:fs";
 import axios from "axios";
-
-// src/debug.ts
-import createDebug from "debug";
-var KEY = "@argos-ci/core";
-var debug = createDebug(KEY);
-var debugTime = (arg) => {
-  const enabled = createDebug.enabled(KEY);
-  if (enabled) {
-    console.time(arg);
-  }
-};
-var debugTimeEnd = (arg) => {
-  const enabled = createDebug.enabled(KEY);
-  if (enabled) {
-    console.timeEnd(arg);
-  }
-};
-
-// src/ci-environment/services/github-actions.ts
 async function getPullRequestFromHeadSha({ env }, sha) {
   debug("Fetching pull request number from head sha", sha);
   if (!env.GITHUB_REPOSITORY) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@argos-ci/core",
   "description": "Node.js SDK for visual testing with Argos.",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "type": "module",
   "main": "./dist/index.cjs",
   "exports": {
@@ -64,5 +64,5 @@
     "lint": "eslint .",
     "test": "vitest"
   },
-  "gitHead": "6385df8f840714c9d77c52b2035bdbbc1b148791"
+  "gitHead": "d357bd6744fb2210d1b8b1fe63de3ae61a51540c"
 }