added support for commit-info and gha info

currents-dev · Jan 10, 2024 · bdd028b · bdd028b
1 parent fc6ad2c
commit bdd028b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cypress-cloud/lib/ciProvider.ts b/packages/cypress-cloud/lib/ciProvider.ts
@@ -31,6 +31,7 @@ import debugFn from "debug";
 
 import _ from "lodash";
 import { ValidationError } from "./errors";
+import { GhaEventData } from "./git";
 
 const debug = debugFn("currents:ci");
 
@@ -650,6 +651,7 @@ type CiProviderData = {
   defaultBranch?: string;
   remoteBranch?: string;
   runAttempt?: string;
+  ghaEventData?: GhaEventData;
 };
 
 interface ProviderCommitParamsRes {
@@ -713,7 +715,7 @@ export function getCommitParams() {
 }
 
 export function getCI(ciBuildId?: string) {
-  const params = getCiParams();
+  const params = getCiParams() as CiParams;
   const provider = getCiProvider();
   if (!ciBuildId) checkForCiBuildFromCi(provider);
 
@@ -741,7 +743,7 @@ export function getCommitDefaults(existingInfo: CiProviderData) {
     existingInfo,
     (
       memo: { [memoKey: string]: string | null },
-      value: string,
+      value: string | GhaEventData,
       key: string
     ) => {
       return (memo[key] = _.defaultTo(value || commitParamsObj[key], null));

diff --git a/packages/cypress-cloud/lib/git.ts b/packages/cypress-cloud/lib/git.ts
@@ -2,6 +2,18 @@
 import { commitInfo } from "@currents/commit-info";
 import { getCommitDefaults } from "./ciProvider";
 
+export type GhaEventData = {
+  headRef: string;
+  headSha: string;
+  baseRef: string;
+  baseSha: string;
+  issueUrl: string;
+  htmlUrl: string;
+  prTitle: string;
+  senderAvatarUrl: string;
+  senderHtmlUrl: string;
+};
+
 export const getGitInfo = async (projectRoot: string) => {
   const commit = await commitInfo();
   return getCommitDefaults({
@@ -11,5 +23,6 @@ export const getGitInfo = async (projectRoot: string) => {
     authorName: commit.author,
     message: commit.message,
     sha: commit.sha,
+    ghaEventData: commit.ghaEventData,
   });
 };
diff --git a/packages/cypress-cloud/package.json b/packages/cypress-cloud/package.json
@@ -53,7 +53,7 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@currents/commit-info": "^1.0.0",
+    "@currents/commit-info": "1.0.1-beta.0",
     "axios": "^1.2.0",
     "axios-retry": "^3.4.0",
     "bluebird": "^3.7.2",