@argos-ci/core 2.8.2 → 2.9.1

package/dist/index.d.ts

@@ -154,6 +154,7 @@ interface Config {
     runAttempt: number | null;
     prNumber: number | null;
     prHeadCommit: string | null;
+    prBaseBranch: string | null;
     mode: "ci" | "monitoring" | null;
     ciProvider: string | null;
     threshold: number | null;

package/dist/index.mjs

@@ -56,7 +56,7 @@ function getMergeBaseCommitShaWithDepth(input) {
     }
 }
 function getMergeBaseCommitSha$1(input) {
-    let depth = 50;
+    let depth = 200;
     while(depth < 1000){
         const mergeBase = getMergeBaseCommitShaWithDepth({
             depth,
@@ -65,10 +65,20 @@ function getMergeBaseCommitSha$1(input) {
         if (mergeBase) {
             return mergeBase;
         }
-        depth += 50;
+        depth += 200;
     }
     return null;
 }
+function listParentCommits$1(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 getPrNumber$2 = ({ env })=>{
     return env.BITRISE_PULL_REQUEST ? Number(env.BITRISE_PULL_REQUEST) : null;
@@ -90,10 +100,12 @@ const service$7 = {
                 env
             }),
             prHeadCommit: null,
+            prBaseBranch: null,
             nonce: env.BITRISEIO_PIPELINE_ID || null
         };
     },
-    getMergeBaseCommitSha: getMergeBaseCommitSha$1
+    getMergeBaseCommitSha: getMergeBaseCommitSha$1,
+    listParentCommits: listParentCommits$1
 };
 
 const service$6 = {
@@ -112,10 +124,12 @@ const service$6 = {
             runAttempt: null,
             prNumber: env.BUILDKITE_PULL_REQUEST ? Number(env.BUILDKITE_PULL_REQUEST) : null,
             prHeadCommit: null,
+            prBaseBranch: null,
             nonce: env.BUILDKITE_BUILD_ID || null
         };
     },
-    getMergeBaseCommitSha: getMergeBaseCommitSha$1
+    getMergeBaseCommitSha: getMergeBaseCommitSha$1,
+    listParentCommits: listParentCommits$1
 };
 
 const service$5 = {
@@ -132,9 +146,11 @@ const service$5 = {
             runAttempt: null,
             prNumber: null,
             prHeadCommit: null,
+            prBaseBranch: null,
             nonce: env.HEROKU_TEST_RUN_ID || null
         }),
-    getMergeBaseCommitSha: getMergeBaseCommitSha$1
+    getMergeBaseCommitSha: getMergeBaseCommitSha$1,
+    listParentCommits: listParentCommits$1
 };
 
 const KEY = "@argos-ci/core";
@@ -262,17 +278,20 @@ const service$4 = {
                 // Branch name is required to create a build but has no real impact on the build.
                 branch: pullRequest?.head.ref || payload.deployment.environment || null,
                 prNumber: pullRequest?.number || null,
-                prHeadCommit: pullRequest?.head.sha || null
+                prHeadCommit: pullRequest?.head.sha || null,
+                prBaseBranch: null
             };
         }
         return {
             ...commonConfig,
             branch: payload?.pull_request?.head.ref || getBranch(context, payload) || null,
             prNumber: payload?.pull_request?.number || null,
-            prHeadCommit: payload?.pull_request?.head.sha ?? null
+            prHeadCommit: payload?.pull_request?.head.sha ?? null,
+            prBaseBranch: payload?.pull_request?.base.ref ?? null
         };
     },
-    getMergeBaseCommitSha: getMergeBaseCommitSha$1
+    getMergeBaseCommitSha: getMergeBaseCommitSha$1,
+    listParentCommits: listParentCommits$1
 };
 
 const getPrNumber$1 = ({ env })=>{
@@ -300,10 +319,12 @@ const service$3 = {
                 env
             }),
             prHeadCommit: null,
+            prBaseBranch: null,
             nonce: env.CIRCLE_WORKFLOW_ID || env.CIRCLE_BUILD_NUM || null
         };
     },
-    getMergeBaseCommitSha: getMergeBaseCommitSha$1
+    getMergeBaseCommitSha: getMergeBaseCommitSha$1,
+    listParentCommits: listParentCommits$1
 };
 
 const getOwner = ({ env })=>{
@@ -334,10 +355,12 @@ const service$2 = {
             runAttempt: null,
             prNumber: getPrNumber(ctx),
             prHeadCommit: null,
+            prBaseBranch: null,
             nonce: env.TRAVIS_BUILD_ID || null
         };
     },
-    getMergeBaseCommitSha: getMergeBaseCommitSha$1
+    getMergeBaseCommitSha: getMergeBaseCommitSha$1,
+    listParentCommits: listParentCommits$1
 };
 
 const service$1 = {
@@ -355,10 +378,12 @@ const service$1 = {
             runAttempt: null,
             prNumber: null,
             prHeadCommit: null,
+            prBaseBranch: null,
             nonce: env.CI_PIPELINE_ID || null
         };
     },
-    getMergeBaseCommitSha: getMergeBaseCommitSha$1
+    getMergeBaseCommitSha: getMergeBaseCommitSha$1,
+    listParentCommits: listParentCommits$1
 };
 
 const service = {
@@ -376,10 +401,12 @@ const service = {
             runAttempt: null,
             prNumber: null,
             prHeadCommit: null,
+            prBaseBranch: null,
             nonce: null
         };
     },
-    getMergeBaseCommitSha: getMergeBaseCommitSha$1
+    getMergeBaseCommitSha: getMergeBaseCommitSha$1,
+    listParentCommits: listParentCommits$1
 };
 
 // List of services ordered by usage
@@ -416,6 +443,16 @@ const services = [
     }
     return service.getMergeBaseCommitSha(input, context);
 }
+/**
+ * Get the merge base commit.
+ */ function listParentCommits(input) {
+    const context = createContext();
+    const service = getCiService(context);
+    if (!service) {
+        return null;
+    }
+    return service.listParentCommits(input, context);
+}
 /**
  * Get the CI environment.
  */ async function getCiEnvironment() {
@@ -517,6 +554,12 @@ const schema = {
         default: null,
         nullable: true
     },
+    prBaseBranch: {
+        env: "ARGOS_PR_BASE_BRANCH",
+        format: String,
+        default: null,
+        nullable: true
+    },
     parallel: {
         env: "ARGOS_PARALLEL",
         default: false,
@@ -605,6 +648,7 @@ async function readConfig(options = {}) {
         buildName: options.buildName || config.get("buildName") || null,
         prNumber: options.prNumber || config.get("prNumber") || ciEnv?.prNumber || null,
         prHeadCommit: config.get("prHeadCommit") || ciEnv?.prHeadCommit || null,
+        prBaseBranch: config.get("prBaseBranch") || ciEnv?.prBaseBranch || null,
         referenceBranch: options.referenceBranch || config.get("referenceBranch") || null,
         referenceCommit: options.referenceCommit || config.get("referenceCommit") || null,
         owner: ciEnv?.owner || null,
@@ -824,27 +868,49 @@ async function uploadFilesToS3(files) {
     if (projectResponse.error) {
         throwAPIError(projectResponse.error);
     }
+    debug("Project fetched", projectResponse.data);
     const { defaultBaseBranch, hasRemoteContentAccess } = projectResponse.data;
-    const referenceBranch = config.referenceBranch || defaultBaseBranch;
     const referenceCommit = (()=>{
         if (config.referenceCommit) {
             debug("Found reference commit in config", config.referenceCommit);
             return config.referenceCommit;
         }
+        // If we have remote access, we will fetch it from the Git Provider.
         if (hasRemoteContentAccess) {
             return null;
         }
+        // We use the pull request as base branch if possible
+        // else branch specified by the user or the default branch.
+        const base = config.referenceBranch || config.prBaseBranch || defaultBaseBranch;
         const sha = getMergeBaseCommitSha({
-            base: referenceBranch,
+            base,
             head: config.branch
         });
         if (sha) {
-            debug("Found reference commit from git", sha);
+            debug("Found merge base", sha);
         } else {
-            debug("No reference commit found in git");
+            debug("No merge base found");
         }
         return sha;
     })();
+    const parentCommits = (()=>{
+        // If we have remote access, we will fetch them from the Git Provider.
+        if (hasRemoteContentAccess) {
+            return null;
+        }
+        if (referenceCommit) {
+            const commits = listParentCommits({
+                sha: referenceCommit
+            });
+            if (commits) {
+                debug("Found parent commits", commits);
+            } else {
+                debug("No parent commits found");
+            }
+            return commits;
+        }
+        return null;
+    })();
     // Create build
     debug("Creating build");
     const [pwTraceKeys, screenshotKeys] = screenshots.reduce(([pwTraceKeys, screenshotKeys], screenshot)=>{
@@ -874,8 +940,9 @@ async function uploadFilesToS3(files) {
             pwTraceKeys,
             prNumber: config.prNumber,
             prHeadCommit: config.prHeadCommit,
-            referenceBranch,
+            referenceBranch: config.referenceBranch,
             referenceCommit,
+            parentCommits,
             argosSdk,
             ciProvider: config.ciProvider,
             runId: config.runId,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@argos-ci/core",
   "description": "Visual testing solution to avoid visual regression. The core component of Argos SDK that handles build creation.",
-  "version": "2.8.2",
+  "version": "2.9.1",
   "type": "module",
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
@@ -40,7 +40,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@argos-ci/api-client": "0.5.1",
+    "@argos-ci/api-client": "0.6.1",
     "@argos-ci/util": "2.1.1",
     "axios": "^1.7.4",
     "convict": "^6.2.4",
@@ -60,5 +60,5 @@
     "build": "rollup -c",
     "e2e": "node ./e2e/upload.cjs && node ./e2e/upload.mjs"
   },
-  "gitHead": "0e6df5391e875daba1da61fac33ca1c215db4bc2"
+  "gitHead": "db599c8bc3021cb18315f4e39717f9c2990e7847"
 }