Refactor Github Action per b/485167538 (#19291)

Co-authored-by: Ben Knutson <benknutson@google.com>
This commit is contained in:
Google Admin
2026-02-17 21:36:31 -05:00
committed by GitHub
parent df22fd22e7
commit d4e3fa2d32
16 changed files with 163 additions and 74 deletions
+10 -6
View File
@@ -39,18 +39,22 @@ runs:
if: "inputs.dry-run != 'true'" if: "inputs.dry-run != 'true'"
env: env:
GH_TOKEN: '${{ inputs.github-token }}' GH_TOKEN: '${{ inputs.github-token }}'
INPUTS_BRANCH_NAME: ${{ inputs.branch-name }}
INPUTS_PR_TITLE: ${{ inputs.pr-title }}
INPUTS_PR_BODY: ${{ inputs.pr-body }}
INPUTS_BASE_BRANCH: ${{ inputs.base-branch }}
shell: 'bash' shell: 'bash'
working-directory: '${{ inputs.working-directory }}' working-directory: '${{ inputs.working-directory }}'
run: | run: |
set -e set -e
if ! git ls-remote --exit-code --heads origin "${{ inputs.branch-name }}"; then if ! git ls-remote --exit-code --heads origin "${INPUTS_BRANCH_NAME}"; then
echo "::error::Branch '${{ inputs.branch-name }}' does not exist on the remote repository." echo "::error::Branch '${INPUTS_BRANCH_NAME}' does not exist on the remote repository."
exit 1 exit 1
fi fi
PR_URL=$(gh pr create \ PR_URL=$(gh pr create \
--title "${{ inputs.pr-title }}" \ --title "${INPUTS_PR_TITLE}" \
--body "${{ inputs.pr-body }}" \ --body "${INPUTS_PR_BODY}" \
--base "${{ inputs.base-branch }}" \ --base "${INPUTS_BASE_BRANCH}" \
--head "${{ inputs.branch-name }}" \ --head "${INPUTS_BRANCH_NAME}" \
--fill) --fill)
gh pr merge "$PR_URL" --auto gh pr merge "$PR_URL" --auto
+12 -6
View File
@@ -30,16 +30,22 @@ runs:
id: 'npm_auth_token' id: 'npm_auth_token'
shell: 'bash' shell: 'bash'
run: | run: |
AUTH_TOKEN="${{ inputs.github-token }}" AUTH_TOKEN="${INPUTS_GITHUB_TOKEN}"
PACKAGE_NAME="${{ inputs.package-name }}" PACKAGE_NAME="${INPUTS_PACKAGE_NAME}"
PRIVATE_REPO="@google-gemini/" PRIVATE_REPO="@google-gemini/"
if [[ "$PACKAGE_NAME" == "$PRIVATE_REPO"* ]]; then if [[ "$PACKAGE_NAME" == "$PRIVATE_REPO"* ]]; then
AUTH_TOKEN="${{ inputs.github-token }}" AUTH_TOKEN="${INPUTS_GITHUB_TOKEN}"
elif [[ "$PACKAGE_NAME" == "@google/gemini-cli" ]]; then elif [[ "$PACKAGE_NAME" == "@google/gemini-cli" ]]; then
AUTH_TOKEN="${{ inputs.wombat-token-cli }}" AUTH_TOKEN="${INPUTS_WOMBAT_TOKEN_CLI}"
elif [[ "$PACKAGE_NAME" == "@google/gemini-cli-core" ]]; then elif [[ "$PACKAGE_NAME" == "@google/gemini-cli-core" ]]; then
AUTH_TOKEN="${{ inputs.wombat-token-core }}" AUTH_TOKEN="${INPUTS_WOMBAT_TOKEN_CORE}"
elif [[ "$PACKAGE_NAME" == "@google/gemini-cli-a2a-server" ]]; then elif [[ "$PACKAGE_NAME" == "@google/gemini-cli-a2a-server" ]]; then
AUTH_TOKEN="${{ inputs.wombat-token-a2a-server }}" AUTH_TOKEN="${INPUTS_WOMBAT_TOKEN_A2A_SERVER}"
fi fi
echo "auth-token=$AUTH_TOKEN" >> $GITHUB_OUTPUT echo "auth-token=$AUTH_TOKEN" >> $GITHUB_OUTPUT
env:
INPUTS_GITHUB_TOKEN: ${{ inputs.github-token }}
INPUTS_PACKAGE_NAME: ${{ inputs.package-name }}
INPUTS_WOMBAT_TOKEN_CLI: ${{ inputs.wombat-token-cli }}
INPUTS_WOMBAT_TOKEN_CORE: ${{ inputs.wombat-token-core }}
INPUTS_WOMBAT_TOKEN_A2A_SERVER: ${{ inputs.wombat-token-a2a-server }}
+41 -20
View File
@@ -90,15 +90,19 @@ runs:
id: 'release_branch' id: 'release_branch'
shell: 'bash' shell: 'bash'
run: | run: |
BRANCH_NAME="release/${{ inputs.release-tag }}" BRANCH_NAME="release/${INPUTS_RELEASE_TAG}"
git switch -c "${BRANCH_NAME}" git switch -c "${BRANCH_NAME}"
echo "BRANCH_NAME=${BRANCH_NAME}" >> "${GITHUB_OUTPUT}" echo "BRANCH_NAME=${BRANCH_NAME}" >> "${GITHUB_OUTPUT}"
env:
INPUTS_RELEASE_TAG: ${{ inputs.release-tag }}
- name: '⬆️ Update package versions' - name: '⬆️ Update package versions'
working-directory: '${{ inputs.working-directory }}' working-directory: '${{ inputs.working-directory }}'
shell: 'bash' shell: 'bash'
run: | run: |
npm run release:version "${{ inputs.release-version }}" npm run release:version "${INPUTS_RELEASE_VERSION}"
env:
INPUTS_RELEASE_VERSION: ${{ inputs.release-version }}
- name: '💾 Commit and Conditionally Push package versions' - name: '💾 Commit and Conditionally Push package versions'
working-directory: '${{ inputs.working-directory }}' working-directory: '${{ inputs.working-directory }}'
@@ -160,23 +164,30 @@ runs:
working-directory: '${{ inputs.working-directory }}' working-directory: '${{ inputs.working-directory }}'
env: env:
NODE_AUTH_TOKEN: '${{ steps.core-token.outputs.auth-token }}' NODE_AUTH_TOKEN: '${{ steps.core-token.outputs.auth-token }}'
INPUTS_DRY_RUN: ${{ inputs.dry-run }}
INPUTS_CORE_PACKAGE_NAME: ${{ inputs.core-package-name }}
shell: 'bash' shell: 'bash'
run: | run: |
npm publish \ npm publish \
--dry-run="${{ inputs.dry-run }}" \ --dry-run="${INPUTS_DRY_RUN}" \
--workspace="${{ inputs.core-package-name }}" \ --workspace="${INPUTS_CORE_PACKAGE_NAME}" \
--no-tag --no-tag
npm dist-tag rm ${{ inputs.core-package-name }} false --silent npm dist-tag rm ${INPUTS_CORE_PACKAGE_NAME} false --silent
- name: '🔗 Install latest core package' - name: '🔗 Install latest core package'
working-directory: '${{ inputs.working-directory }}' working-directory: '${{ inputs.working-directory }}'
if: "${{ inputs.dry-run != 'true' }}" if: "${{ inputs.dry-run != 'true' }}"
shell: 'bash' shell: 'bash'
run: | run: |
npm install "${{ inputs.core-package-name }}@${{ inputs.release-version }}" \ npm install "${INPUTS_CORE_PACKAGE_NAME}@${INPUTS_RELEASE_VERSION}" \
--workspace="${{ inputs.cli-package-name }}" \ --workspace="${INPUTS_CLI_PACKAGE_NAME}" \
--workspace="${{ inputs.a2a-package-name }}" \ --workspace="${INPUTS_A2A_PACKAGE_NAME}" \
--save-exact --save-exact
env:
INPUTS_CORE_PACKAGE_NAME: ${{ inputs.core-package-name }}
INPUTS_RELEASE_VERSION: ${{ inputs.release-version }}
INPUTS_CLI_PACKAGE_NAME: ${{ inputs.cli-package-name }}
INPUTS_A2A_PACKAGE_NAME: ${{ inputs.a2a-package-name }}
- name: 'Get CLI Token' - name: 'Get CLI Token'
uses: './.github/actions/npm-auth-token' uses: './.github/actions/npm-auth-token'
@@ -192,13 +203,15 @@ runs:
working-directory: '${{ inputs.working-directory }}' working-directory: '${{ inputs.working-directory }}'
env: env:
NODE_AUTH_TOKEN: '${{ steps.cli-token.outputs.auth-token }}' NODE_AUTH_TOKEN: '${{ steps.cli-token.outputs.auth-token }}'
INPUTS_DRY_RUN: ${{ inputs.dry-run }}
INPUTS_CLI_PACKAGE_NAME: ${{ inputs.cli-package-name }}
shell: 'bash' shell: 'bash'
run: | run: |
npm publish \ npm publish \
--dry-run="${{ inputs.dry-run }}" \ --dry-run="${INPUTS_DRY_RUN}" \
--workspace="${{ inputs.cli-package-name }}" \ --workspace="${INPUTS_CLI_PACKAGE_NAME}" \
--no-tag --no-tag
npm dist-tag rm ${{ inputs.cli-package-name }} false --silent npm dist-tag rm ${INPUTS_CLI_PACKAGE_NAME} false --silent
- name: 'Get a2a-server Token' - name: 'Get a2a-server Token'
uses: './.github/actions/npm-auth-token' uses: './.github/actions/npm-auth-token'
@@ -214,14 +227,16 @@ runs:
working-directory: '${{ inputs.working-directory }}' working-directory: '${{ inputs.working-directory }}'
env: env:
NODE_AUTH_TOKEN: '${{ steps.a2a-token.outputs.auth-token }}' NODE_AUTH_TOKEN: '${{ steps.a2a-token.outputs.auth-token }}'
INPUTS_DRY_RUN: ${{ inputs.dry-run }}
INPUTS_A2A_PACKAGE_NAME: ${{ inputs.a2a-package-name }}
shell: 'bash' shell: 'bash'
# Tag staging for initial release # Tag staging for initial release
run: | run: |
npm publish \ npm publish \
--dry-run="${{ inputs.dry-run }}" \ --dry-run="${INPUTS_DRY_RUN}" \
--workspace="${{ inputs.a2a-package-name }}" \ --workspace="${INPUTS_A2A_PACKAGE_NAME}" \
--no-tag --no-tag
npm dist-tag rm ${{ inputs.a2a-package-name }} false --silent npm dist-tag rm ${INPUTS_A2A_PACKAGE_NAME} false --silent
- name: '🔬 Verify NPM release by version' - name: '🔬 Verify NPM release by version'
uses: './.github/actions/verify-release' uses: './.github/actions/verify-release'
@@ -255,13 +270,16 @@ runs:
if: "${{ inputs.dry-run != 'true' && inputs.skip-github-release != 'true' && inputs.npm-tag != 'dev' && inputs.npm-registry-url != 'https://npm.pkg.github.com/' }}" if: "${{ inputs.dry-run != 'true' && inputs.skip-github-release != 'true' && inputs.npm-tag != 'dev' && inputs.npm-registry-url != 'https://npm.pkg.github.com/' }}"
env: env:
GITHUB_TOKEN: '${{ inputs.github-token }}' GITHUB_TOKEN: '${{ inputs.github-token }}'
INPUTS_RELEASE_TAG: ${{ inputs.release-tag }}
STEPS_RELEASE_BRANCH_OUTPUTS_BRANCH_NAME: ${{ steps.release_branch.outputs.BRANCH_NAME }}
INPUTS_PREVIOUS_TAG: ${{ inputs.previous-tag }}
shell: 'bash' shell: 'bash'
run: | run: |
gh release create "${{ inputs.release-tag }}" \ gh release create "${INPUTS_RELEASE_TAG}" \
bundle/gemini.js \ bundle/gemini.js \
--target "${{ steps.release_branch.outputs.BRANCH_NAME }}" \ --target "${STEPS_RELEASE_BRANCH_OUTPUTS_BRANCH_NAME}" \
--title "Release ${{ inputs.release-tag }}" \ --title "Release ${INPUTS_RELEASE_TAG}" \
--notes-start-tag "${{ inputs.previous-tag }}" \ --notes-start-tag "${INPUTS_PREVIOUS_TAG}" \
--generate-notes \ --generate-notes \
${{ inputs.npm-tag != 'latest' && '--prerelease' || '' }} ${{ inputs.npm-tag != 'latest' && '--prerelease' || '' }}
@@ -271,5 +289,8 @@ runs:
continue-on-error: true continue-on-error: true
shell: 'bash' shell: 'bash'
run: | run: |
echo "Cleaning up release branch ${{ steps.release_branch.outputs.BRANCH_NAME }}..." echo "Cleaning up release branch ${STEPS_RELEASE_BRANCH_OUTPUTS_BRANCH_NAME}..."
git push origin --delete "${{ steps.release_branch.outputs.BRANCH_NAME }}" git push origin --delete "${STEPS_RELEASE_BRANCH_OUTPUTS_BRANCH_NAME}"
env:
STEPS_RELEASE_BRANCH_OUTPUTS_BRANCH_NAME: ${{ steps.release_branch.outputs.BRANCH_NAME }}
+3 -1
View File
@@ -52,8 +52,10 @@ runs:
id: 'branch_name' id: 'branch_name'
shell: 'bash' shell: 'bash'
run: | run: |
REF_NAME="${{ inputs.ref-name }}" REF_NAME="${INPUTS_REF_NAME}"
echo "name=${REF_NAME%/merge}" >> $GITHUB_OUTPUT echo "name=${REF_NAME%/merge}" >> $GITHUB_OUTPUT
env:
INPUTS_REF_NAME: ${{ inputs.ref-name }}
- name: 'Build and Push the Docker Image' - name: 'Build and Push the Docker Image'
uses: 'docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83' # ratchet:docker/build-push-action@v6 uses: 'docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83' # ratchet:docker/build-push-action@v6
with: with:
+10 -4
View File
@@ -56,8 +56,8 @@ runs:
id: 'image_tag' id: 'image_tag'
shell: 'bash' shell: 'bash'
run: |- run: |-
SHELL_TAG_NAME="${{ inputs.github-ref-name }}" SHELL_TAG_NAME="${INPUTS_GITHUB_REF_NAME}"
FINAL_TAG="${{ inputs.github-sha }}" FINAL_TAG="${INPUTS_GITHUB_SHA}"
if [[ "$SHELL_TAG_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.-]+)?$ ]]; then if [[ "$SHELL_TAG_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.-]+)?$ ]]; then
echo "Release detected." echo "Release detected."
FINAL_TAG="${SHELL_TAG_NAME#v}" FINAL_TAG="${SHELL_TAG_NAME#v}"
@@ -66,22 +66,28 @@ runs:
fi fi
echo "Determined image tag: $FINAL_TAG" echo "Determined image tag: $FINAL_TAG"
echo "FINAL_TAG=$FINAL_TAG" >> $GITHUB_OUTPUT echo "FINAL_TAG=$FINAL_TAG" >> $GITHUB_OUTPUT
env:
INPUTS_GITHUB_REF_NAME: ${{ inputs.github-ref-name }}
INPUTS_GITHUB_SHA: ${{ inputs.github-sha }}
- name: 'build' - name: 'build'
id: 'docker_build' id: 'docker_build'
shell: 'bash' shell: 'bash'
env: env:
GEMINI_SANDBOX_IMAGE_TAG: '${{ steps.image_tag.outputs.FINAL_TAG }}' GEMINI_SANDBOX_IMAGE_TAG: '${{ steps.image_tag.outputs.FINAL_TAG }}'
GEMINI_SANDBOX: 'docker' GEMINI_SANDBOX: 'docker'
STEPS_IMAGE_TAG_OUTPUTS_FINAL_TAG: ${{ steps.image_tag.outputs.FINAL_TAG }}
run: |- run: |-
npm run build:sandbox -- \ npm run build:sandbox -- \
--image google/gemini-cli-sandbox:${{ steps.image_tag.outputs.FINAL_TAG }} \ --image google/gemini-cli-sandbox:${STEPS_IMAGE_TAG_OUTPUTS_FINAL_TAG} \
--output-file final_image_uri.txt --output-file final_image_uri.txt
echo "uri=$(cat final_image_uri.txt)" >> $GITHUB_OUTPUT echo "uri=$(cat final_image_uri.txt)" >> $GITHUB_OUTPUT
- name: 'publish' - name: 'publish'
shell: 'bash' shell: 'bash'
if: "${{ inputs.dry-run != 'true' }}" if: "${{ inputs.dry-run != 'true' }}"
run: |- run: |-
docker push "${{ steps.docker_build.outputs.uri }}" docker push "${STEPS_DOCKER_BUILD_OUTPUTS_URI}"
env:
STEPS_DOCKER_BUILD_OUTPUTS_URI: ${{ steps.docker_build.outputs.uri }}
- name: 'Create issue on failure' - name: 'Create issue on failure'
if: |- if: |-
${{ failure() }} ${{ failure() }}
+3 -1
View File
@@ -18,5 +18,7 @@ runs:
shell: 'bash' shell: 'bash'
run: |- run: |-
echo ""@google-gemini:registry=https://npm.pkg.github.com"" > ~/.npmrc echo ""@google-gemini:registry=https://npm.pkg.github.com"" > ~/.npmrc
echo ""//npm.pkg.github.com/:_authToken=${{ inputs.github-token }}"" >> ~/.npmrc echo ""//npm.pkg.github.com/:_authToken=${INPUTS_GITHUB_TOKEN}"" >> ~/.npmrc
echo ""@google:registry=https://wombat-dressing-room.appspot.com"" >> ~/.npmrc echo ""@google:registry=https://wombat-dressing-room.appspot.com"" >> ~/.npmrc
env:
INPUTS_GITHUB_TOKEN: ${{ inputs.github-token }}
+24 -4
View File
@@ -71,10 +71,13 @@ runs:
${{ inputs.dry-run != 'true' }} ${{ inputs.dry-run != 'true' }}
env: env:
NODE_AUTH_TOKEN: '${{ steps.core-token.outputs.auth-token }}' NODE_AUTH_TOKEN: '${{ steps.core-token.outputs.auth-token }}'
INPUTS_CORE_PACKAGE_NAME: ${{ inputs.core-package-name }}
INPUTS_VERSION: ${{ inputs.version }}
INPUTS_CHANNEL: ${{ inputs.channel }}
shell: 'bash' shell: 'bash'
working-directory: '${{ inputs.working-directory }}' working-directory: '${{ inputs.working-directory }}'
run: | run: |
npm dist-tag add ${{ inputs.core-package-name }}@${{ inputs.version }} ${{ inputs.channel }} npm dist-tag add ${INPUTS_CORE_PACKAGE_NAME}@${INPUTS_VERSION} ${INPUTS_CHANNEL}
- name: 'Get cli Token' - name: 'Get cli Token'
uses: './.github/actions/npm-auth-token' uses: './.github/actions/npm-auth-token'
@@ -91,10 +94,13 @@ runs:
${{ inputs.dry-run != 'true' }} ${{ inputs.dry-run != 'true' }}
env: env:
NODE_AUTH_TOKEN: '${{ steps.cli-token.outputs.auth-token }}' NODE_AUTH_TOKEN: '${{ steps.cli-token.outputs.auth-token }}'
INPUTS_CLI_PACKAGE_NAME: ${{ inputs.cli-package-name }}
INPUTS_VERSION: ${{ inputs.version }}
INPUTS_CHANNEL: ${{ inputs.channel }}
shell: 'bash' shell: 'bash'
working-directory: '${{ inputs.working-directory }}' working-directory: '${{ inputs.working-directory }}'
run: | run: |
npm dist-tag add ${{ inputs.cli-package-name }}@${{ inputs.version }} ${{ inputs.channel }} npm dist-tag add ${INPUTS_CLI_PACKAGE_NAME}@${INPUTS_VERSION} ${INPUTS_CHANNEL}
- name: 'Get a2a Token' - name: 'Get a2a Token'
uses: './.github/actions/npm-auth-token' uses: './.github/actions/npm-auth-token'
@@ -111,10 +117,13 @@ runs:
${{ inputs.dry-run == 'false' }} ${{ inputs.dry-run == 'false' }}
env: env:
NODE_AUTH_TOKEN: '${{ steps.a2a-token.outputs.auth-token }}' NODE_AUTH_TOKEN: '${{ steps.a2a-token.outputs.auth-token }}'
INPUTS_A2A_PACKAGE_NAME: ${{ inputs.a2a-package-name }}
INPUTS_VERSION: ${{ inputs.version }}
INPUTS_CHANNEL: ${{ inputs.channel }}
shell: 'bash' shell: 'bash'
working-directory: '${{ inputs.working-directory }}' working-directory: '${{ inputs.working-directory }}'
run: | run: |
npm dist-tag add ${{ inputs.a2a-package-name }}@${{ inputs.version }} ${{ inputs.channel }} npm dist-tag add ${INPUTS_A2A_PACKAGE_NAME}@${INPUTS_VERSION} ${INPUTS_CHANNEL}
- name: 'Log dry run' - name: 'Log dry run'
if: |- if: |-
@@ -122,4 +131,15 @@ runs:
shell: 'bash' shell: 'bash'
working-directory: '${{ inputs.working-directory }}' working-directory: '${{ inputs.working-directory }}'
run: | run: |
echo "Dry run: Would have added tag '${{ inputs.channel }}' to version '${{ inputs.version }}' for ${{ inputs.cli-package-name }}, ${{ inputs.core-package-name }}, and ${{ inputs.a2a-package-name }}." echo "Dry run: Would have added tag '${INPUTS_CHANNEL}' to version '${INPUTS_VERSION}' for ${INPUTS_CLI_PACKAGE_NAME}, ${INPUTS_CORE_PACKAGE_NAME}, and ${INPUTS_A2A_PACKAGE_NAME}."
env:
INPUTS_CHANNEL: ${{ inputs.channel }}
INPUTS_VERSION: ${{ inputs.version }}
INPUTS_CLI_PACKAGE_NAME: ${{ inputs.cli-package-name }}
INPUTS_CORE_PACKAGE_NAME: ${{ inputs.core-package-name }}
INPUTS_A2A_PACKAGE_NAME: ${{ inputs.a2a-package-name }}
+11 -5
View File
@@ -64,10 +64,13 @@ runs:
working-directory: '${{ inputs.working-directory }}' working-directory: '${{ inputs.working-directory }}'
run: |- run: |-
gemini_version=$(gemini --version) gemini_version=$(gemini --version)
if [ "$gemini_version" != "${{ inputs.expected-version }}" ]; then if [ "$gemini_version" != "${INPUTS_EXPECTED_VERSION}" ]; then
echo "❌ NPM Version mismatch: Got $gemini_version from ${{ inputs.npm-package }}, expected ${{ inputs.expected-version }}" echo "❌ NPM Version mismatch: Got $gemini_version from ${INPUTS_NPM_PACKAGE}, expected ${INPUTS_EXPECTED_VERSION}"
exit 1 exit 1
fi fi
env:
INPUTS_EXPECTED_VERSION: ${{ inputs.expected-version }}
INPUTS_NPM_PACKAGE: ${{ inputs.npm-package }}
- name: 'Clear npm cache' - name: 'Clear npm cache'
shell: 'bash' shell: 'bash'
@@ -77,11 +80,14 @@ runs:
shell: 'bash' shell: 'bash'
working-directory: '${{ inputs.working-directory }}' working-directory: '${{ inputs.working-directory }}'
run: |- run: |-
gemini_version=$(npx --prefer-online "${{ inputs.npm-package}}" --version) gemini_version=$(npx --prefer-online "${INPUTS_NPM_PACKAGE}" --version)
if [ "$gemini_version" != "${{ inputs.expected-version }}" ]; then if [ "$gemini_version" != "${INPUTS_EXPECTED_VERSION}" ]; then
echo "❌ NPX Run Version mismatch: Got $gemini_version from ${{ inputs.npm-package }}, expected ${{ inputs.expected-version }}" echo "❌ NPX Run Version mismatch: Got $gemini_version from ${INPUTS_NPM_PACKAGE}, expected ${INPUTS_EXPECTED_VERSION}"
exit 1 exit 1
fi fi
env:
INPUTS_NPM_PACKAGE: ${{ inputs.npm-package }}
INPUTS_EXPECTED_VERSION: ${{ inputs.expected-version }}
- name: 'Install dependencies for integration tests' - name: 'Install dependencies for integration tests'
shell: 'bash' shell: 'bash'
+8 -4
View File
@@ -53,7 +53,7 @@ jobs:
REPO_NAME: '${{ github.event.inputs.repo_name }}' REPO_NAME: '${{ github.event.inputs.repo_name }}'
run: | run: |
mkdir -p ./pr mkdir -p ./pr
echo '${{ env.REPO_NAME }}' > ./pr/repo_name echo '${REPO_NAME}' > ./pr/repo_name
- uses: 'actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02' # ratchet:actions/upload-artifact@v4 - uses: 'actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02' # ratchet:actions/upload-artifact@v4
with: with:
name: 'repo_name' name: 'repo_name'
@@ -321,13 +321,17 @@ jobs:
steps: steps:
- name: 'Check E2E test results' - name: 'Check E2E test results'
run: | run: |
if [[ ${{ needs.e2e_linux.result }} != 'success' || \ if [[ ${NEEDS_E2E_LINUX_RESULT} != 'success' || \
${{ needs.e2e_mac.result }} != 'success' || \ ${NEEDS_E2E_MAC_RESULT} != 'success' || \
${{ needs.evals.result }} != 'success' ]]; then ${NEEDS_EVALS_RESULT} != 'success' ]]; then
echo "One or more E2E jobs failed." echo "One or more E2E jobs failed."
exit 1 exit 1
fi fi
echo "All required E2E jobs passed!" echo "All required E2E jobs passed!"
env:
NEEDS_E2E_LINUX_RESULT: ${{ needs.e2e_linux.result }}
NEEDS_E2E_MAC_RESULT: ${{ needs.e2e_mac.result }}
NEEDS_EVALS_RESULT: ${{ needs.evals.result }}
set_workflow_status: set_workflow_status:
runs-on: 'gemini-cli-ubuntu-16-core' runs-on: 'gemini-cli-ubuntu-16-core'
+13 -6
View File
@@ -410,13 +410,20 @@ jobs:
steps: steps:
- name: 'Check all job results' - name: 'Check all job results'
run: | run: |
if [[ (${{ needs.lint.result }} != 'success' && ${{ needs.lint.result }} != 'skipped') || \ if [[ (${NEEDS_LINT_RESULT} != 'success' && ${NEEDS_LINT_RESULT} != 'skipped') || \
(${{ needs.link_checker.result }} != 'success' && ${{ needs.link_checker.result }} != 'skipped') || \ (${NEEDS_LINK_CHECKER_RESULT} != 'success' && ${NEEDS_LINK_CHECKER_RESULT} != 'skipped') || \
(${{ needs.test_linux.result }} != 'success' && ${{ needs.test_linux.result }} != 'skipped') || \ (${NEEDS_TEST_LINUX_RESULT} != 'success' && ${NEEDS_TEST_LINUX_RESULT} != 'skipped') || \
(${{ needs.test_mac.result }} != 'success' && ${{ needs.test_mac.result }} != 'skipped') || \ (${NEEDS_TEST_MAC_RESULT} != 'success' && ${NEEDS_TEST_MAC_RESULT} != 'skipped') || \
(${{ needs.codeql.result }} != 'success' && ${{ needs.codeql.result }} != 'skipped') || \ (${NEEDS_CODEQL_RESULT} != 'success' && ${NEEDS_CODEQL_RESULT} != 'skipped') || \
(${{ needs.bundle_size.result }} != 'success' && ${{ needs.bundle_size.result }} != 'skipped') ]]; then (${NEEDS_BUNDLE_SIZE_RESULT} != 'success' && ${NEEDS_BUNDLE_SIZE_RESULT} != 'skipped') ]]; then
echo "One or more CI jobs failed." echo "One or more CI jobs failed."
exit 1 exit 1
fi fi
echo "All CI jobs passed!" echo "All CI jobs passed!"
env:
NEEDS_LINT_RESULT: ${{ needs.lint.result }}
NEEDS_LINK_CHECKER_RESULT: ${{ needs.link_checker.result }}
NEEDS_TEST_LINUX_RESULT: ${{ needs.test_linux.result }}
NEEDS_TEST_MAC_RESULT: ${{ needs.test_mac.result }}
NEEDS_CODEQL_RESULT: ${{ needs.codeql.result }}
NEEDS_BUNDLE_SIZE_RESULT: ${{ needs.bundle_size.result }}
+5 -5
View File
@@ -68,10 +68,10 @@ jobs:
VERBOSE: 'true' VERBOSE: 'true'
shell: 'bash' shell: 'bash'
run: | run: |
if [[ "${{ env.IS_DOCKER }}" == "true" ]]; then if [[ "${IS_DOCKER}" == "true" ]]; then
npm run deflake:test:integration:sandbox:docker -- --runs="${{ env.RUNS }}" -- --testNamePattern "'${{ env.TEST_NAME_PATTERN }}'" npm run deflake:test:integration:sandbox:docker -- --runs="${RUNS}" -- --testNamePattern "'${TEST_NAME_PATTERN}'"
else else
npm run deflake:test:integration:sandbox:none -- --runs="${{ env.RUNS }}" -- --testNamePattern "'${{ env.TEST_NAME_PATTERN }}'" npm run deflake:test:integration:sandbox:none -- --runs="${RUNS}" -- --testNamePattern "'${TEST_NAME_PATTERN}'"
fi fi
deflake_e2e_mac: deflake_e2e_mac:
@@ -109,7 +109,7 @@ jobs:
TEST_NAME_PATTERN: '${{ github.event.inputs.test_name_pattern }}' TEST_NAME_PATTERN: '${{ github.event.inputs.test_name_pattern }}'
VERBOSE: 'true' VERBOSE: 'true'
run: | run: |
npm run deflake:test:integration:sandbox:none -- --runs="${{ env.RUNS }}" -- --testNamePattern "'${{ env.TEST_NAME_PATTERN }}'" npm run deflake:test:integration:sandbox:none -- --runs="${RUNS}" -- --testNamePattern "'${TEST_NAME_PATTERN}'"
deflake_e2e_windows: deflake_e2e_windows:
name: 'Slow E2E - Win' name: 'Slow E2E - Win'
@@ -167,4 +167,4 @@ jobs:
TEST_NAME_PATTERN: '${{ github.event.inputs.test_name_pattern }}' TEST_NAME_PATTERN: '${{ github.event.inputs.test_name_pattern }}'
shell: 'pwsh' shell: 'pwsh'
run: | run: |
npm run deflake:test:integration:sandbox:none -- --runs="${{ env.RUNS }}" -- --testNamePattern "'${{ env.TEST_NAME_PATTERN }}'" npm run deflake:test:integration:sandbox:none -- --runs="$env:RUNS" -- --testNamePattern "'$env:TEST_NAME_PATTERN'"
+1 -1
View File
@@ -44,5 +44,5 @@ jobs:
- name: 'Run evaluation' - name: 'Run evaluation'
working-directory: '/app' working-directory: '/app'
run: | run: |
poetry run exp_run --experiment-mode=on-demand --branch-or-commit=${{ github.ref_name }} --model-name=gemini-2.5-pro --dataset=swebench_verified --concurrency=15 poetry run exp_run --experiment-mode=on-demand --branch-or-commit=${GITHUB_REF_NAME} --model-name=gemini-2.5-pro --dataset=swebench_verified --concurrency=15
poetry run python agent_prototypes/scripts/parse_gcli_logs_experiment.py --experiment_dir=experiments/adhoc/gcli_temp_exp --gcs-bucket="${EVAL_GCS_BUCKET}" --gcs-path=gh_action_artifacts poetry run python agent_prototypes/scripts/parse_gcli_logs_experiment.py --experiment_dir=experiments/adhoc/gcli_temp_exp --gcs-bucket="${EVAL_GCS_BUCKET}" --gcs-path=gh_action_artifacts
+1 -1
View File
@@ -60,7 +60,7 @@ jobs:
TEST_NAME_PATTERN: '${{ github.event.inputs.test_name_pattern }}' TEST_NAME_PATTERN: '${{ github.event.inputs.test_name_pattern }}'
run: | run: |
CMD="npm run test:all_evals" CMD="npm run test:all_evals"
PATTERN="${{ env.TEST_NAME_PATTERN }}" PATTERN="${TEST_NAME_PATTERN}"
if [[ -n "$PATTERN" ]]; then if [[ -n "$PATTERN" ]]; then
if [[ "$PATTERN" == *.ts || "$PATTERN" == *.js || "$PATTERN" == */* ]]; then if [[ "$PATTERN" == *.ts || "$PATTERN" == *.js || "$PATTERN" == */* ]]; then
+11 -5
View File
@@ -118,6 +118,7 @@ jobs:
ORIGINAL_RELEASE_VERSION: '${{ steps.patch_version.outputs.RELEASE_VERSION }}' ORIGINAL_RELEASE_VERSION: '${{ steps.patch_version.outputs.RELEASE_VERSION }}'
ORIGINAL_RELEASE_TAG: '${{ steps.patch_version.outputs.RELEASE_TAG }}' ORIGINAL_RELEASE_TAG: '${{ steps.patch_version.outputs.RELEASE_TAG }}'
ORIGINAL_PREVIOUS_TAG: '${{ steps.patch_version.outputs.PREVIOUS_TAG }}' ORIGINAL_PREVIOUS_TAG: '${{ steps.patch_version.outputs.PREVIOUS_TAG }}'
VARS_CLI_PACKAGE_NAME: ${{vars.CLI_PACKAGE_NAME}}
run: | run: |
echo "🔍 Verifying no concurrent patch releases have occurred..." echo "🔍 Verifying no concurrent patch releases have occurred..."
@@ -129,7 +130,7 @@ jobs:
# Re-run the same version calculation script # Re-run the same version calculation script
echo "Re-calculating version to check for changes..." echo "Re-calculating version to check for changes..."
CURRENT_PATCH_JSON=$(node scripts/get-release-version.js --cli-package-name="${{vars.CLI_PACKAGE_NAME}}" --type=patch --patch-from="${CHANNEL}") CURRENT_PATCH_JSON=$(node scripts/get-release-version.js --cli-package-name="${VARS_CLI_PACKAGE_NAME}" --type=patch --patch-from="${CHANNEL}")
CURRENT_RELEASE_VERSION=$(echo "${CURRENT_PATCH_JSON}" | jq -r .releaseVersion) CURRENT_RELEASE_VERSION=$(echo "${CURRENT_PATCH_JSON}" | jq -r .releaseVersion)
CURRENT_RELEASE_TAG=$(echo "${CURRENT_PATCH_JSON}" | jq -r .releaseTag) CURRENT_RELEASE_TAG=$(echo "${CURRENT_PATCH_JSON}" | jq -r .releaseTag)
CURRENT_PREVIOUS_TAG=$(echo "${CURRENT_PATCH_JSON}" | jq -r .previousReleaseTag) CURRENT_PREVIOUS_TAG=$(echo "${CURRENT_PATCH_JSON}" | jq -r .previousReleaseTag)
@@ -162,10 +163,15 @@ jobs:
- name: 'Print Calculated Version' - name: 'Print Calculated Version'
run: |- run: |-
echo "Patch Release Summary:" echo "Patch Release Summary:"
echo " Release Version: ${{ steps.patch_version.outputs.RELEASE_VERSION }}" echo " Release Version: ${STEPS_PATCH_VERSION_OUTPUTS_RELEASE_VERSION}"
echo " Release Tag: ${{ steps.patch_version.outputs.RELEASE_TAG }}" echo " Release Tag: ${STEPS_PATCH_VERSION_OUTPUTS_RELEASE_TAG}"
echo " NPM Tag: ${{ steps.patch_version.outputs.NPM_TAG }}" echo " NPM Tag: ${STEPS_PATCH_VERSION_OUTPUTS_NPM_TAG}"
echo " Previous Tag: ${{ steps.patch_version.outputs.PREVIOUS_TAG }}" echo " Previous Tag: ${STEPS_PATCH_VERSION_OUTPUTS_PREVIOUS_TAG}"
env:
STEPS_PATCH_VERSION_OUTPUTS_RELEASE_VERSION: ${{ steps.patch_version.outputs.RELEASE_VERSION }}
STEPS_PATCH_VERSION_OUTPUTS_RELEASE_TAG: ${{ steps.patch_version.outputs.RELEASE_TAG }}
STEPS_PATCH_VERSION_OUTPUTS_NPM_TAG: ${{ steps.patch_version.outputs.NPM_TAG }}
STEPS_PATCH_VERSION_OUTPUTS_PREVIOUS_TAG: ${{ steps.patch_version.outputs.PREVIOUS_TAG }}
- name: 'Run Tests' - name: 'Run Tests'
if: "${{github.event.inputs.force_skip_tests != 'true'}}" if: "${{github.event.inputs.force_skip_tests != 'true'}}"
+8 -3
View File
@@ -360,23 +360,28 @@ jobs:
- name: 'Create and switch to a new branch' - name: 'Create and switch to a new branch'
id: 'release_branch' id: 'release_branch'
run: | run: |
BRANCH_NAME="chore/nightly-version-bump-${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}" BRANCH_NAME="chore/nightly-version-bump-${NEEDS_CALCULATE_VERSIONS_OUTPUTS_NEXT_NIGHTLY_VERSION}"
git switch -c "${BRANCH_NAME}" git switch -c "${BRANCH_NAME}"
echo "BRANCH_NAME=${BRANCH_NAME}" >> "${GITHUB_OUTPUT}" echo "BRANCH_NAME=${BRANCH_NAME}" >> "${GITHUB_OUTPUT}"
env:
NEEDS_CALCULATE_VERSIONS_OUTPUTS_NEXT_NIGHTLY_VERSION: ${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}
- name: 'Update package versions' - name: 'Update package versions'
run: 'npm run release:version "${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}"' run: 'npm run release:version "${NEEDS_CALCULATE_VERSIONS_OUTPUTS_NEXT_NIGHTLY_VERSION}"'
env:
NEEDS_CALCULATE_VERSIONS_OUTPUTS_NEXT_NIGHTLY_VERSION: ${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}
- name: 'Commit and Push package versions' - name: 'Commit and Push package versions'
env: env:
BRANCH_NAME: '${{ steps.release_branch.outputs.BRANCH_NAME }}' BRANCH_NAME: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
DRY_RUN: '${{ github.event.inputs.dry_run }}' DRY_RUN: '${{ github.event.inputs.dry_run }}'
NEEDS_CALCULATE_VERSIONS_OUTPUTS_NEXT_NIGHTLY_VERSION: ${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}
run: |- run: |-
git add package.json packages/*/package.json git add package.json packages/*/package.json
if [ -f package-lock.json ]; then if [ -f package-lock.json ]; then
git add package-lock.json git add package-lock.json
fi fi
git commit -m "chore(release): bump version to ${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}" git commit -m "chore(release): bump version to ${NEEDS_CALCULATE_VERSIONS_OUTPUTS_NEXT_NIGHTLY_VERSION}"
if [[ "${DRY_RUN}" == "false" ]]; then if [[ "${DRY_RUN}" == "false" ]]; then
echo "Pushing release branch to remote..." echo "Pushing release branch to remote..."
git push --set-upstream origin "${BRANCH_NAME}" git push --set-upstream origin "${BRANCH_NAME}"
+2 -2
View File
@@ -23,8 +23,8 @@ jobs:
HEAD_SHA: '${{ github.event.inputs.head_sha || github.event.pull_request.head.sha }}' HEAD_SHA: '${{ github.event.inputs.head_sha || github.event.pull_request.head.sha }}'
run: | run: |
mkdir -p ./pr mkdir -p ./pr
echo '${{ env.REPO_NAME }}' > ./pr/repo_name echo '${REPO_NAME}' > ./pr/repo_name
echo '${{ env.HEAD_SHA }}' > ./pr/head_sha echo '${HEAD_SHA}' > ./pr/head_sha
- uses: 'actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02' # ratchet:actions/upload-artifact@v4 - uses: 'actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02' # ratchet:actions/upload-artifact@v4
with: with:
name: 'repo_name' name: 'repo_name'