check for existing variables

cypress-io · Aug 28, 2023 · afef3a6 · afef3a6
1 parent ade6071
commit afef3a6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -74593,7 +74593,9 @@ const detectPrNumber = async () => {
     GITHUB_RUN_ID,
     GITHUB_REPOSITORY,
     GITHUB_HEAD_REF,
-    GITHUB_REF
+    GITHUB_REF,
+    CYPRESS_PULL_REQUEST_ID,
+    CYPRESS_PULL_REQUEST_URL
   } = process.env
 
   const [owner, repo] = GITHUB_REPOSITORY.split('/')
@@ -74629,6 +74631,10 @@ const detectPrNumber = async () => {
     }
 
     if (prNumber) {
+      if (!CYPRESS_PULL_REQUEST_ID) {
+        core.exportVariable('CYPRESS_PULL_REQUEST_ID', prNumber)
+      }
+
       const prResp = await client.request(
         'GET /repos/:owner/:repo/pulls/:pull_number',
         {
@@ -74639,12 +74645,12 @@ const detectPrNumber = async () => {
       )
 
       if (prResp && prResp.data && prResp.data.html_url) {
-        // TODO: Check for existence of these variables
-        core.exportVariable('CYPRESS_PULL_REQUEST_ID', prNumber)
-        core.exportVariable(
-          'CYPRESS_PULL_REQUEST_URL',
-          prResp.data.html_url
-        )
+        if (!CYPRESS_PULL_REQUEST_URL) {
+          core.exportVariable(
+            'CYPRESS_PULL_REQUEST_URL',
+            prResp.data.html_url
+          )
+        }
       }
     }
   }

diff --git a/index.js b/index.js
@@ -443,7 +443,9 @@ const detectPrNumber = async () => {
     GITHUB_RUN_ID,
     GITHUB_REPOSITORY,
     GITHUB_HEAD_REF,
-    GITHUB_REF
+    GITHUB_REF,
+    CYPRESS_PULL_REQUEST_ID,
+    CYPRESS_PULL_REQUEST_URL
   } = process.env
 
   const [owner, repo] = GITHUB_REPOSITORY.split('/')
@@ -479,6 +481,10 @@ const detectPrNumber = async () => {
     }
 
     if (prNumber) {
+      if (!CYPRESS_PULL_REQUEST_ID) {
+        core.exportVariable('CYPRESS_PULL_REQUEST_ID', prNumber)
+      }
+
       const prResp = await client.request(
         'GET /repos/:owner/:repo/pulls/:pull_number',
         {
@@ -489,12 +495,12 @@ const detectPrNumber = async () => {
       )
 
       if (prResp && prResp.data && prResp.data.html_url) {
-        // TODO: Check for existence of these variables
-        core.exportVariable('CYPRESS_PULL_REQUEST_ID', prNumber)
-        core.exportVariable(
-          'CYPRESS_PULL_REQUEST_URL',
-          prResp.data.html_url
-        )
+        if (!CYPRESS_PULL_REQUEST_URL) {
+          core.exportVariable(
+            'CYPRESS_PULL_REQUEST_URL',
+            prResp.data.html_url
+          )
+        }
       }
     }
   }