From 7468d3cddfb55d70c85051c35a48c7090df3ccb3 Mon Sep 17 00:00:00 2001
From: Brandon Keiji <brandonkeiji@google.com>
Date: Thu, 29 May 2025 23:43:20 +0000
Subject: fix(sandbox): add SHORT_SHA to image tag (#604)

---
 .gcp/dogfood.yaml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to '.gcp/dogfood.yaml')

diff --git a/.gcp/dogfood.yaml b/.gcp/dogfood.yaml
index 01eddded..18335fbc 100644
--- a/.gcp/dogfood.yaml
+++ b/.gcp/dogfood.yaml
@@ -4,22 +4,21 @@ steps:
     entrypoint: 'npm'
     args: ['install']
 
-  # Step 2: Update version with build suffix
+  # Step 2: Update version in root package.json
   - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
-    entrypoint: 'npm'
+    entrypoint: 'bash'
     args:
-      [
-        'run',
-        'prerelease:version',
-        '--workspaces',
-        '--',
-        '--suffix="$SHORT_SHA.$_REVISION"',
-      ]
+      - -c # Use bash -c to allow for command substitution and string manipulation
+      - |
+        current_version=$(npm pkg get version | sed 's/"//g')
+        new_version="$${current_version}-$SHORT_SHA.$_REVISION"
+        npm pkg set "version=$${new_version}"
+        echo "Set root package.json version to: $${new_version}"
 
-  # Step 3: Bind dependencies to the new versions
+  # Step 3: Run prerelease:dev to update workspace versions and dependencies
   - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
     entrypoint: 'npm'
-    args: ['run', 'prerelease:deps', '--workspaces']
+    args: ['run', 'prerelease:dev'] # This will run prerelease:version and prerelease:deps
 
   # Step 4: Authenticate for Docker and NPM
   - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
-- 
cgit v1.2.3