Add refName to GitHub connection info and streamline workflow investi…

…gation logic
microsoft · Sep 27, 2024 · b463343 · b463343
1 parent 04a5c17
commit b463343
Show file tree

Hide file tree

Showing 21 changed files with 46 additions and 10 deletions.
diff --git a/.github/workflows/genai-investigator.yml b/.github/workflows/genai-investigator.yml
@@ -13,12 +13,7 @@ permissions:
     actions: read
     pull-requests: write
 jobs:
-    logging:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Print workflow_run event
-              run: echo "${{ toJson(github.event.workflow_run) }}"
-    check_failure:
+    investigate:
         # Only run this job if the workflow run concluded with a failure
         # and was triggered by a pull request event
         if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.event == 'pull_request' }}

diff --git a/docs/genaisrc/genaiscript.d.ts b/docs/genaisrc/genaiscript.d.ts
diff --git a/genaisrc/genaiscript.d.ts b/genaisrc/genaiscript.d.ts
diff --git a/packages/auto/genaiscript.d.ts b/packages/auto/genaiscript.d.ts
diff --git a/packages/core/src/genaisrc/genaiscript.d.ts b/packages/core/src/genaisrc/genaiscript.d.ts
diff --git a/packages/core/src/github.ts b/packages/core/src/github.ts
@@ -18,6 +18,7 @@ export interface GithubConnectionInfo {
     owner: string
     repo: string
     ref?: string
+    refName?: string
     sha?: string
     issue?: number
     runId?: string
@@ -31,6 +32,7 @@ function githubFromEnv(env: Record<string, string>): GithubConnectionInfo {
     const repository = env.GITHUB_REPOSITORY
     const [owner, repo] = repository?.split("/", 2) || [undefined, undefined]
     const ref = env.GITHUB_REF
+    const refName = env.GITHUB_REF_NAME
     const sha = env.GITHUB_SHA
     const commitSha = env.GITHUB_COMMIT_SHA
     const runId = env.GITHUB_RUN_ID
@@ -51,6 +53,7 @@ function githubFromEnv(env: Record<string, string>): GithubConnectionInfo {
         owner,
         repo,
         ref,
+        refName,
         sha,
         issue,
         runId,
@@ -439,12 +442,16 @@ export class GitHubClient implements GitHub {
             token: auth,
             repo,
             owner,
+            ref,
+            refName,
         } = await this.connection()
         return Object.freeze({
             baseUrl,
             repo,
             owner,
             auth,
+            ref,
+            refName,
         })
     }
 

diff --git a/packages/core/src/types/prompt_template.d.ts b/packages/core/src/types/prompt_template.d.ts
@@ -1264,6 +1264,8 @@ interface GitHubOptions {
     repo: string
     baseUrl?: string
     auth?: string
+    ref?: string
+    refName?: string
 }
 
 type GitHubWorkflowRunStatus =

diff --git a/packages/sample/genaisrc/blog/genaiscript.d.ts b/packages/sample/genaisrc/blog/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/gai.genai.mts b/packages/sample/genaisrc/gai.genai.mts
@@ -25,11 +25,9 @@ if (!workflow) {
 
 const ffid = env.vars.failure_run_id
 const lsid = env.vars.success_run_id
-const { owner, repo } = await github.info()
+const { owner, repo, refName } = await github.info()
 
-let branch =
-    env.vars.branch ||
-    (await host.exec("git branch --show-current")).stdout.trim()
+let branch = env.vars.branch || refName
 if (!branch) {
     const branches = await github.listBranches()
     branch = await host.select("Select a branch", branches)

diff --git a/packages/sample/genaisrc/genaiscript.d.ts b/packages/sample/genaisrc/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/node/genaiscript.d.ts b/packages/sample/genaisrc/node/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/python/genaiscript.d.ts b/packages/sample/genaisrc/python/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/style/genaiscript.d.ts b/packages/sample/genaisrc/style/genaiscript.d.ts
diff --git a/packages/sample/src/aici/genaiscript.d.ts b/packages/sample/src/aici/genaiscript.d.ts
diff --git a/packages/sample/src/errors/genaiscript.d.ts b/packages/sample/src/errors/genaiscript.d.ts
diff --git a/packages/sample/src/genaiscript.d.ts b/packages/sample/src/genaiscript.d.ts
diff --git a/packages/sample/src/makecode/genaiscript.d.ts b/packages/sample/src/makecode/genaiscript.d.ts
diff --git a/packages/sample/src/tla/genaiscript.d.ts b/packages/sample/src/tla/genaiscript.d.ts
diff --git a/packages/sample/src/vision/genaiscript.d.ts b/packages/sample/src/vision/genaiscript.d.ts
diff --git a/packages/vscode/genaisrc/genaiscript.d.ts b/packages/vscode/genaisrc/genaiscript.d.ts
diff --git a/slides/genaisrc/genaiscript.d.ts b/slides/genaisrc/genaiscript.d.ts