From 7d243b215662eccfe95515aeca1e661ef08659e0 Mon Sep 17 00:00:00 2001
From: Ehsan Mirzarazi <ehsanmirzarazi@ehsans-mbp.home>
Date: Fri, 16 Feb 2024 10:44:02 +0100
Subject: [PATCH] fix: extract port from base url if api url is not provided

---
 .github/workflows/auto-merge.yml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 946a2d6..eb157d0 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -28,8 +28,16 @@ jobs:
       - name: Extract port from cypress.json
         id: vars
         run: |
-          apiUrl=$(jq -r '.env.apiUrl' ./cypress.json)
+          apiUrl=$(jq -r '.env.apiUrl // .baseUrl // empty' ./cypress.json)
+          if [[ -z "$apiUrl" ]]; then
+            echo "API URL or Base URL not found in cypress.json."
+            exit 1
+          fi
           port=$(echo $apiUrl | grep -o '[0-9]\+')
+          if [[ -z "$port" ]]; then
+            echo "Port not found in URL."
+            exit 1
+          fi
           echo "Extracted port: $port"
           echo "::set-output name=port::$port"
       - name: Run tests
@@ -58,8 +66,16 @@ jobs:
       - name: Extract port from cypress.json
         id: vars
         run: |
-          apiUrl=$(jq -r '.env.apiUrl' ./cypress.json)
+          apiUrl=$(jq -r '.env.apiUrl // .baseUrl // empty' ./cypress.json)
+          if [[ -z "$apiUrl" ]]; then
+            echo "API URL or Base URL not found in cypress.json."
+            exit 1
+          fi
           port=$(echo $apiUrl | grep -o '[0-9]\+')
+          if [[ -z "$port" ]]; then
+            echo "Port not found in URL."
+            exit 1
+          fi
           echo "Extracted port: $port"
           echo "::set-output name=port::$port"
       - name: Run tests