@argos-ci/core 2.4.2-alpha.4 → 2.4.2-alpha.7

package/dist/index.mjs

@@ -48,7 +48,7 @@ import { createRequire } from 'node:module';
 function getMergeBaseCommitShaWithDepth(input) {
     const head = input.head || `HEAD`;
     try {
-        execSync(`git fetch origin ${head} --depth ${input.depth}`);
+        execSync(`git fetch origin ${head}:${head} --depth ${input.depth}`);
         execSync(`git fetch origin ${input.base}:${input.base} --depth ${input.depth}`);
         const mergeBase = execSync(`git merge-base ${head} ${input.base}`).toString().trim();
         return mergeBase || null;
@@ -60,8 +60,8 @@ function getMergeBaseCommitSha$1(input) {
     let depth = 50;
     while(depth < 1000){
         const mergeBase = getMergeBaseCommitShaWithDepth({
-            ...input,
-            depth
+            depth,
+            ...input
         });
         if (mergeBase) {
             return mergeBase;
@@ -273,16 +273,7 @@ const service$4 = {
             prHeadCommit: payload?.pull_request?.head.sha ?? null
         };
     },
-    getMergeBaseCommitSha: (input, ctx)=>{
-        const payload = readEventPayload(ctx);
-        const branch = getBranch(ctx, payload);
-        // Unshallow the repository to get the merge base commit
-        execSync(`git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"`);
-        return getMergeBaseCommitSha$1({
-            base: input.base,
-            head: branch
-        });
-    }
+    getMergeBaseCommitSha: getMergeBaseCommitSha$1
 };
 
 const getPrNumber$1 = ({ env })=>{
@@ -682,15 +673,17 @@ const hashFile = async (filepath)=>{
 };
 
 const base64Encode = (obj)=>Buffer.from(JSON.stringify(obj), "utf8").toString("base64");
-function getBearerToken({ token, ciProvider, owner, repository, jobId, runId, prNumber }) {
-    if (token) return `Bearer ${token}`;
+function getAuthToken({ token, ciProvider, owner, repository, jobId, runId, prNumber }) {
+    if (token) {
+        return token;
+    }
     switch(ciProvider){
         case "github-actions":
             {
                 if (!owner || !repository || !jobId || !runId) {
                     throw new Error(`Automatic GitHub Actions variables detection failed. Please add the 'ARGOS_TOKEN'`);
                 }
-                return `Bearer tokenless-github-${base64Encode({
+                return `tokenless-github-${base64Encode({
                     owner,
                     repository,
                     jobId,
@@ -831,14 +824,14 @@ async function uploadFilesToS3(files) {
         "**/*.{png,jpg,jpeg}"
     ];
     debug("Using config and files", config, files);
-    const authToken = getBearerToken(config);
+    const authToken = getAuthToken(config);
     const apiClient = createClient({
         baseUrl: config.apiBaseUrl,
-        authToken: authToken
+        authToken
     });
     const legacyApiClient = createArgosLegacyAPIClient({
         baseUrl: config.apiBaseUrl,
-        bearerToken: authToken
+        bearerToken: `Bearer ${authToken}`
     });
     // Collect screenshots
     const foundScreenshots = await discoverScreenshots(files, {
@@ -891,7 +884,8 @@ async function uploadFilesToS3(files) {
             return null;
         }
         const sha = getMergeBaseCommitSha({
-            base: referenceBranch
+            base: referenceBranch,
+            head: config.branch
         });
         if (sha) {
             debug("Found reference commit from git", sha);

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.4.2-alpha.4+4b6e8a3",
+  "version": "2.4.2-alpha.7+3eb419d",
   "type": "module",
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
@@ -40,8 +40,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@argos-ci/api-client": "0.1.1-alpha.32+4b6e8a3",
-    "@argos-ci/util": "2.1.1-alpha.12+4b6e8a3",
+    "@argos-ci/api-client": "0.1.1-alpha.35+3eb419d",
+    "@argos-ci/util": "2.1.1-alpha.15+3eb419d",
     "axios": "^1.7.4",
     "convict": "^6.2.4",
     "debug": "^4.3.6",
@@ -60,5 +60,5 @@
     "build": "rollup -c",
     "e2e": "node ./e2e/upload.cjs && node ./e2e/upload.mjs"
   },
-  "gitHead": "4b6e8a36627d466e65859396ec6cfee717ba7c7b"
+  "gitHead": "3eb419d3b661bf705619e1ec869cc73e05165b53"
 }