dry up docker

.gcp/release-docker.yaml

@@ -17,34 +17,48 @@ steps:
     entrypoint: 'npm'
     args: ['run', 'build:packages']
 
-  # Step 6: Build sandbox container image
+  # Step 6: Determine Docker Image Tag
+  - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
+    id: 'Determine Docker Image Tag'
+    entrypoint: 'bash'
+    args:
+      - -c
+      - |
+        IMAGE_TAG="$SHORT_SHA" # Default to SHA
+        if [[ "$TAG_NAME" == *"+nightly"* ]]; then
+          echo "Nightly release detected."
+          IMAGE_TAG="${TAG_NAME#v}"
+        elif [[ "$TAG_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+          echo "Official release detected."
+          IMAGE_TAG="${TAG_NAME#v}"
+        else
+          echo "Development/RC release detected. Using commit SHA as tag."
+        fi
+        echo "Determined image tag: $IMAGE_TAG"
+        echo "$IMAGE_TAG" > /workspace/image_tag.txt
+
+  # Step 7: Build sandbox container image
   - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
     id: 'Build sandbox Docker image'
     entrypoint: 'bash'
     args:
       - -c
       - |
-        if [ "$_OFFICIAL_RELEASE" = "true" ]; then
-          export GEMINI_SANDBOX_IMAGE_TAG="${TAG_NAME#v}"
-        else
-          export GEMINI_SANDBOX_IMAGE_TAG="$SHORT_SHA"
-        fi
+        export GEMINI_SANDBOX_IMAGE_TAG=$(cat /workspace/image_tag.txt)
+        echo "Using Docker image tag for build: $GEMINI_SANDBOX_IMAGE_TAG"
         npm run build:sandbox:fast
     env:
       - 'GEMINI_SANDBOX=$_CONTAINER_TOOL'
 
-  # Step 7: Publish sandbox container image
+  # Step 8: Publish sandbox container image
   - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
     id: 'Publish sandbox Docker image'
     entrypoint: 'bash'
     args:
       - -c
       - |
-        if [ "$_OFFICIAL_RELEASE" = "true" ]; then
-          export GEMINI_SANDBOX_IMAGE_TAG="${TAG_NAME#v}"
-        else
-          export GEMINI_SANDBOX_IMAGE_TAG="$SHORT_SHA"
-        fi
+        export GEMINI_SANDBOX_IMAGE_TAG=$(cat /workspace/image_tag.txt)
+        echo "Using Docker image tag for publish: $GEMINI_SANDBOX_IMAGE_TAG"
         npm run publish:sandbox
     env:
       - 'GEMINI_SANDBOX=$_CONTAINER_TOOL'
@@ -54,5 +68,4 @@ options:
   dynamicSubstitutions: true
 
 substitutions:
-  _OFFICIAL_RELEASE: 'false'
   _CONTAINER_TOOL: 'docker'

.github/workflows/release.yml

@@ -98,6 +98,7 @@ jobs:
           npm run release:version ${{ steps.version.outputs.RELEASE_VERSION }}
 
       - name: Commit package versions
+        id: commit_step
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
@@ -106,8 +107,10 @@ jobs:
             echo "Changes detected, creating commit."
             git commit -m "chore(release): ${{ steps.version.outputs.RELEASE_TAG }}"
             git push --set-upstream origin ${{ steps.release_branch.outputs.BRANCH_NAME }} --follow-tags
+            echo "committed=true" >> $GITHUB_OUTPUT
           else
             echo "No version changes to commit."
+            echo "committed=false" >> $GITHUB_OUTPUT
           fi
 
       - name: Create GitHub Release and Tag
@@ -115,10 +118,16 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RELEASE_BRANCH: ${{ steps.release_branch.outputs.BRANCH_NAME }}
+          COMMITTED: ${{ steps.commit_step.outputs.committed }}
         run: |
+          TARGET_COMMITISH="main"
+          if [[ "$COMMITTED" == "true" ]]; then
+            TARGET_COMMITISH="$RELEASE_BRANCH"
+          fi
+          echo "Creating release against target: $TARGET_COMMITISH"
           gh release create ${{ steps.version.outputs.RELEASE_TAG }} \
             bundle/gemini.js \
-            --target "$RELEASE_BRANCH" \
+            --target "$TARGET_COMMITISH" \
             --title "Release ${{ steps.version.outputs.RELEASE_TAG }}" \
             --generate-notes
 
@@ -140,7 +149,7 @@ jobs:
           NODE_AUTH_TOKEN: ${{ secrets.WOMBAT_TOKEN_CORE }}
 
       - name: Install latest core package
-        run: npm install @google/gemini-cli-core@${{ steps.version.outputs.RELEASE_VERSION }} --workspace=@google/gemini-cli --save-exact
+        run: npm install @google/gemini-cli-core@${{ steps.version.outputs.NPM_TAG }} --workspace=@google/gemini-cli --save-exact
 
       - name: Publish @google/gemini-cli
         run: npm publish --workspace=@google/gemini-cli --tag=${{ steps.version.outputs.NPM_TAG }} ${{ inputs.dry_run && '--dry-run' || '' }}