expose github issue number in github_issue

microsoft · Jun 12, 2024 · c6bedb3 · c6bedb3
1 parent 043207f
commit c6bedb3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/genai-commander.yml b/.github/workflows/genai-commander.yml
@@ -47,6 +47,7 @@ jobs:
               if: contains(github.event.comment.body, '/genai-describe')
               run: node packages/cli/built/genaiscript.cjs run pr-describe --out ./temp/genai/pr-describe -prd --out-trace $GITHUB_STEP_SUMMARY
               env:
+                  GITHUB_ISSUE: ${{ github.event.issue.number }}
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                   OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
                   OPENAI_API_TYPE: ${{ secrets.OPENAI_API_TYPE }}
@@ -55,6 +56,7 @@ jobs:
               if: contains(github.event.comment.body, '/genai-review')
               run: node packages/cli/built/genaiscript.cjs run pr-review --out ./temp/genai/pr-review -prc --out-trace $GITHUB_STEP_SUMMARY
               env:
+                  GITHUB_ISSUE: ${{ github.event.issue.number }}
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                   GITHUB_COMMIT_SHA: ${{ fromJSON(steps.sha.outputs.result).sha }}
                   OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}

diff --git a/packages/core/src/github.ts b/packages/core/src/github.ts
@@ -35,7 +35,7 @@ export function parseGHTokenFromEnv(
         serverUrl && runId
             ? `${serverUrl}/${repository}/actions/runs/${runId}`
             : undefined
-    const issue = normalizeInt(
+    const issue = env.GITHUB_ISSUE ?? normalizeInt(
         /^refs\/pull\/(?<issue>\d+)\/merge$/.exec(ref || "")?.groups?.issue
     )