Fix merge build handling in GitHub Actions (#71)

all-i-code · Apr 25, 2023 · 63dba2b · 63dba2b
1 parent 16d6d0d
commit 63dba2b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/tests/utils.test.js b/src/tests/utils.test.js
@@ -589,7 +589,7 @@ describe('utils', () => {
 
       describe('when doing a merge build', () => {
         beforeEach(() => {
-          env.GITHUB_REF = 'main'
+          env.GITHUB_REF = 'refs/heads/main'
 
           saveEnv(Object.keys(env), realEnv)
           setEnv(env)

diff --git a/src/utils.js b/src/utils.js
@@ -132,7 +132,8 @@ function processEnv(config) {
   // If still no prNumber, check ref (some CIs don't have prNumber or prUrl)
   if (config.computed.ci.prNumber === 'false') {
     const parts = getEnv(config.ci.env.ref, '').split('/')
-    config.computed.ci.prNumber = parts[parts.length - 2] || 'false'
+    const prNumber = parseInt(parts[parts.length - 2], 10)
+    config.computed.ci.prNumber = prNumber ? String(prNumber) : 'false'
   }
 
   config.computed.ci.isPr = config.computed.ci.prNumber !== 'false'