Update branch env setting as well

twistedpair · Dec 5, 2024 · 8fbe266 · 8fbe266
1 parent 215cd9c
commit 8fbe266
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -70,10 +70,6 @@ async function run() {
     const nowAsTimeExpectedIsoString = nowAsTimeIsoString.replace(/\.\d{3}Z/, 'Z'); // No millis expect
     setVariable(environmentVariables_1.EnvironmentVariables.CI_TIMESTAMP, nowSeconds.toString());
     setVariable(environmentVariables_1.EnvironmentVariables.CI_STRING_TIME, nowAsTimeExpectedIsoString);
-    const branchName = context?.ref?.match(/[^/]+$/)?.[0];
-    if (branchName) {
-        setVariable(environmentVariables_1.EnvironmentVariables.CI_BRANCH, branchName);
-    }
     setVariable(environmentVariables_1.EnvironmentVariables.CI_REPO_NAME, event?.repository?.name);
 }
 function populatePushEventCommitDetails(pushEvent, context) {
@@ -84,10 +80,16 @@ function populatePushEventCommitDetails(pushEvent, context) {
     setVariable(environmentVariables_1.EnvironmentVariables.CI_COMMITTER_USERNAME, author?.username);
     setVariable(environmentVariables_1.EnvironmentVariables.CI_COMMITTER_EMAIL, author?.email ?? '');
     setVariable(environmentVariables_1.EnvironmentVariables.CI_COMMITTER_NAME, author?.name);
+    const branchName = context?.ref?.match(/[^/]+$/)?.[0];
+    if (branchName) {
+        setVariable(environmentVariables_1.EnvironmentVariables.CI_BRANCH, branchName);
+    }
 }
 async function populatePullRequestEventCommitDetails(pullRequestEvent, context) {
     const head = pullRequestEvent.pull_request.head;
-    const user = head?.user;
+    const branch = head?.ref;
+    const branchName = context?.ref?.match(/[^/]+$/)?.[0];
+    setVariable(environmentVariables_1.EnvironmentVariables.CI_BRANCH, branchName);
     setVariable(environmentVariables_1.EnvironmentVariables.CI_COMMIT_ID, head?.sha);
     setVariable(environmentVariables_1.EnvironmentVariables.CI_COMMITTER_USERNAME, pullRequestEvent.sender?.login);
     setVariable(environmentVariables_1.EnvironmentVariables.CI_PULL_REQUEST, pullRequestEvent.pull_request.url);

diff --git a/src/index.ts b/src/index.ts
@@ -47,12 +47,6 @@ async function run(): Promise<void> {
   ); // No millis expect
   setVariable(EnvironmentVariables.CI_TIMESTAMP, nowSeconds.toString());
   setVariable(EnvironmentVariables.CI_STRING_TIME, nowAsTimeExpectedIsoString);
-
-  const branchName = context?.ref?.match(/[^/]+$/)?.[0];
-  if (branchName) {
-    setVariable(EnvironmentVariables.CI_BRANCH, branchName);
-  }
-
   setVariable(EnvironmentVariables.CI_REPO_NAME, event?.repository?.name);
 }
 
@@ -67,14 +61,21 @@ function populatePushEventCommitDetails(
   setVariable(EnvironmentVariables.CI_COMMITTER_USERNAME, author?.username);
   setVariable(EnvironmentVariables.CI_COMMITTER_EMAIL, author?.email ?? '');
   setVariable(EnvironmentVariables.CI_COMMITTER_NAME, author?.name);
+
+  const branchName = context?.ref?.match(/[^/]+$/)?.[0];
+  if (branchName) {
+    setVariable(EnvironmentVariables.CI_BRANCH, branchName);
+  }
 }
 
 async function populatePullRequestEventCommitDetails(
   pullRequestEvent: PullRequestEvent,
   context: Context,
 ) {
   const head = pullRequestEvent.pull_request.head;
-  const user = head?.user;
+  const branch = head?.ref;
+  const branchName = context?.ref?.match(/[^/]+$/)?.[0];
+  setVariable(EnvironmentVariables.CI_BRANCH, branchName);
   setVariable(EnvironmentVariables.CI_COMMIT_ID, head?.sha);
   setVariable(
     EnvironmentVariables.CI_COMMITTER_USERNAME,