upload ref in status report

github · May 14, 2020 · f49335f · f49335f
1 parent d7b9f5a
commit f49335f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/lib/upload-lib.js b/lib/upload-lib.js
diff --git a/lib/util.js b/lib/util.js
diff --git a/src/upload-lib.ts b/src/upload-lib.ts
@@ -145,7 +145,7 @@ async function uploadFiles(sarifFiles: string[]): Promise<boolean> {
 
         const commitOid = util.getRequiredEnvParam('GITHUB_SHA');
         const workflowRunIDStr = util.getRequiredEnvParam('GITHUB_RUN_ID');
-        const ref = util.getRequiredEnvParam('GITHUB_REF'); // it's in the form "refs/heads/master"
+        const ref = util.getRef();
         const analysisKey = await util.getAnalysisKey();
         const analysisName = util.getRequiredEnvParam('GITHUB_WORKFLOW');
         const startedAt = process.env[sharedEnv.CODEQL_ACTION_STARTED_AT];

diff --git a/src/util.ts b/src/util.ts
@@ -200,13 +200,22 @@ export async function getAnalysisKey(): Promise<string> {
     return analysisKey;
 }
 
+/**
+ * Get the ref currently being analyzed.
+ */
+export function getRef(): string {
+    // it's in the form "refs/heads/master"
+    return getRequiredEnvParam('GITHUB_REF');
+}
+
 interface StatusReport {
     "workflow_run_id": number;
     "workflow_name": string;
     "job_name": string;
     "matrix_vars"?: string;
     "languages": string;
     "commit_oid": string;
+    "ref": string;
     "action_name": string;
     "action_oid": string;
     "started_at": string;
@@ -232,6 +241,7 @@ async function createStatusReport(
     Promise<StatusReport> {
 
     const commitOid = process.env['GITHUB_SHA'] || '';
+    const ref = getRef();
     const workflowRunIDStr = process.env['GITHUB_RUN_ID'];
     let workflowRunID = -1;
     if (workflowRunIDStr) {
@@ -249,6 +259,7 @@ async function createStatusReport(
         job_name: jobName,
         languages: languages,
         commit_oid: commitOid,
+        ref: ref,
         action_name: actionName,
         action_oid: "unknown", // TODO decide if it's possible to fill this in
         started_at: startedAt,