jcarr
/
gemini-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix(ci): Correct container publishing pipeline and improve robustness (#4093)

This commit is contained in:
Abhi 2025-07-14 00:19:58 -04:00 committed by GitHub
parent ef8ec98489
commit 8d0a4082a4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gcp/release-docker.yaml
View File

@ -24,13 +24,15 @@ steps:
args: args:
- -c - -c
- | - |
SHELL_TAG_NAME="$TAG_NAME"
FINAL_TAG="$SHORT_SHA" # Default to SHA FINAL_TAG="$SHORT_SHA" # Default to SHA
if [[ "$TAG_NAME" == *"-nightly"* ]]; then if [[ "$$SHELL_TAG_NAME" == *"-nightly"* ]]; then
echo "Nightly release detected." echo "Nightly release detected."
FINAL_TAG="${TAG_NAME#v}" FINAL_TAG="$${SHELL_TAG_NAME#v}"
elif [[ "$TAG_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then # Also escape the variable in the regex match
elif [[ "$$SHELL_TAG_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
echo "Official release detected." echo "Official release detected."
FINAL_TAG="${TAG_NAME#v}" FINAL_TAG="$${SHELL_TAG_NAME#v}"
else else
echo "Development/RC release detected. Using commit SHA as tag." echo "Development/RC release detected. Using commit SHA as tag."
fi fi
@ -58,10 +60,7 @@ steps:
- -c - -c
- | - |
set -e set -e
IMAGE_TAG=$$(cat /workspace/image_tag.txt) FINAL_IMAGE_URI=$$(cat /workspace/final_image_uri.txt)
BASE_IMAGE_URI=$$(npm run -s config get sandboxImageUri)
IMAGE_URI_NO_TAG=$${BASE_IMAGE_URI%:*}
FINAL_IMAGE_URI="$${IMAGE_URI_NO_TAG}:$${IMAGE_TAG}"
echo "Pushing sandbox image: $${FINAL_IMAGE_URI}" echo "Pushing sandbox image: $${FINAL_IMAGE_URI}"
$_CONTAINER_TOOL push "$${FINAL_IMAGE_URI}" $_CONTAINER_TOOL push "$${FINAL_IMAGE_URI}"

10
scripts/build_sandbox.js
View File

@ -18,7 +18,7 @@
// limitations under the License. // limitations under the License.
import { execSync } from 'child_process'; import { execSync } from 'child_process';
import { chmodSync, readFileSync, rmSync } from 'fs'; import { chmodSync, existsSync, readFileSync, rmSync, writeFileSync } from 'fs';
import { join } from 'path'; import { join } from 'path';
import yargs from 'yargs'; import yargs from 'yargs';
import { hideBin } from 'yargs/helpers'; import { hideBin } from 'yargs/helpers';
@ -134,6 +134,14 @@ function buildImage(imageName, dockerfile) {
{ stdio: buildStdout, shell: '/bin/bash' }, { stdio: buildStdout, shell: '/bin/bash' },
); );
console.log(`built ${finalImageName}`); console.log(`built ${finalImageName}`);
if (existsSync('/workspace/final_image_uri.txt')) {
// The publish step only supports one image. If we build multiple, only the last one
// will be published. Throw an error to make this failure explicit.
throw new Error(
'CI artifact file /workspace/final_image_uri.txt already exists. Refusing to overwrite.',
);
}
writeFileSync('/workspace/final_image_uri.txt', finalImageName);
} }
if (baseImage && baseDockerfile) { if (baseImage && baseDockerfile) {