Merge pull request #4 from uselagoon/lagoon_cli_3x_hotfix

Lagoon cli 3x hotfix
uselagoon · Jan 31, 2025 · f3b7424 · f3b7424
2 parents dc93169 + 0d5398b
commit f3b7424
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # Use the uselagoon/lagoon-cli as a base image
 # FROM uselagoon/lagoon-cli as base
-FROM ghcr.io/uselagoon/lagoon-cli:v0.31.3 as base
+FROM ghcr.io/uselagoon/lagoon-cli:v0.31.4 as base
 
 
 RUN apk update && apk upgrade && apk add python3 py3-pip

diff --git a/README.md b/README.md
@@ -180,7 +180,7 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Lagoon Upsert Variable
-      uses: uselagoon/lagoon-action@v1
+      uses: uselagoon/lagoon-action@v1.0.1
       with:
         action: 'upsert_variable'
         ssh_private_key: ${{ secrets.LAGOON_SSH_PRIVATE_KEY }}

diff --git a/action.py b/action.py
@@ -90,7 +90,11 @@ def deploy_environment(project_name, environment_name, buildVars, wait_till_depl
     debugLog(f"Running Lagoon CLI command: {lagoon_command}")
 
     # Call the Lagoon CLI command and capture the output
-    build_id = run_lagoon_command(lagoon_command)
+    output = run_lagoon_command(lagoon_command)
+
+    # grab buildid
+    result_json = json.loads(output)
+    build_id = result_json["result"]
 
     debugLog(f"Deployment initiated. Build ID: {build_id}")
 
@@ -120,7 +124,9 @@ def deploy_pull_request(project_name, pr_title, pr_number, baseBranchName, baseB
     debugLog(f"Running Lagoon CLI command: {lagoon_command}")  
 
     # Call the Lagoon CLI command and capture the output
-    build_id = run_lagoon_command(lagoon_command)
+    output = run_lagoon_command(lagoon_command)
+    result_json = json.loads(output)
+    build_id = result_json["result"]
 
     debugLog(f"Deployment initiated. Build ID: {build_id}")