fix: extract port from base url if api url is not provided

DevSkillsHQ · Feb 16, 2024 · 7d243b2 · 7d243b2
1 parent 30c8b80
commit 7d243b2
Showing 1 changed file with 18 additions and 2 deletions.
diff --git 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