chore: merge release v1.35.0 to main

.github/.release-please-manifest-v1.json

@@ -0,0 +1,3 @@
+{
+  ".": "1.35.0"
+}

.github/release-please-config-v2.json → .github/release-please-config-v1.json

@@ -3,13 +3,11 @@
   "packages": {
     ".": {
       "release-type": "python",
-      "versioning": "prerelease",
-      "prerelease": true,
-      "prerelease-type": "alpha",
+      "versioning": "default",
       "package-name": "google-adk",
       "include-component-in-tag": false,
       "skip-github-release": true,
-      "changelog-path": "CHANGELOG-v2.md",
+      "changelog-path": "CHANGELOG.md",
       "changelog-sections": [
         {
           "type": "feat",
@@ -58,5 +56,6 @@
         }
       ]
     }
-  }
+  },
+  "last-release-sha": "ecfdaf5f5e7accfbb4294cb8cc56c910dad2b1a8"
 }

.github/workflows/pre-commit.yml

@@ -16,13 +16,13 @@ name: Pre-commit Checks
 
 on:
   push:
-    branches: [main, v2]
+    branches: [main, v1, v2]
     paths:
       - '**.py'
       - '.pre-commit-config.yaml'
       - 'pyproject.toml'
   pull_request:
-    branches: [main, v2]
+    branches: [main, v1, v2]
     paths:
       - '**.py'
       - '.pre-commit-config.yaml'

.github/workflows/python-unit-tests.yml

@@ -16,9 +16,9 @@ name: Python Unit Tests
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, v1 ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, v1 ]
 
 permissions:
   contents: read

.github/workflows/release-v2-cherry-pick.yml → .github/workflows/release-v1-cherry-pick.yml

@@ -1,7 +1,7 @@
-# Step 3 (v2, optional): Cherry-picks a commit from v2 to the release/v2-candidate branch.
+# Step 3 (v1, optional): Cherry-picks a commit from v1 to the release/v1-candidate branch.
 # Use between step 1 and step 4 to include bug fixes in an in-progress release.
 # Note: Does NOT auto-trigger release-please to preserve manual changelog edits.
-name: "Release v2: Cherry-pick"
+name: "Release v1: Cherry-pick"
 
 on:
   workflow_dispatch:
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
         with:
-          ref: release/v2-candidate
+          ref: release/v1-candidate
           fetch-depth: 0
 
       - name: Configure git
@@ -30,14 +30,14 @@ jobs:
 
       - name: Cherry-pick commit
         run: |
-          echo "Cherry-picking ${INPUTS_COMMIT_SHA} to release/v2-candidate"
+          echo "Cherry-picking ${INPUTS_COMMIT_SHA} to release/v1-candidate"
           git cherry-pick ${INPUTS_COMMIT_SHA}
         env:
           INPUTS_COMMIT_SHA: ${{ inputs.commit_sha }}
 
       - name: Push changes
         run: |
-          git push origin release/v2-candidate
-          echo "Successfully cherry-picked commit to release/v2-candidate"
+          git push origin release/v1-candidate
+          echo "Successfully cherry-picked commit to release/v1-candidate"
           echo "Note: Release Please is NOT auto-triggered to preserve manual changelog edits."
-          echo "Run release-v2-please.yml manually if you want to regenerate the changelog."
+          echo "Run release-v1-please.yml manually if you want to regenerate the changelog."

.github/workflows/release-v1-cut.yml

@@ -0,0 +1,46 @@
+# Step 1 (v1): Starts the v1 release process by creating a release/v1-candidate branch.
+# Generates a changelog PR for review (step 2).
+name: "Release v1: Cut"
+
+on:
+  workflow_dispatch:
+    inputs:
+      commit_sha:
+        description: 'Commit SHA to cut from (leave empty for latest v1)'
+        required: false
+        type: string
+
+permissions:
+  contents: write
+  actions: write
+
+jobs:
+  cut-release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          ref: ${{ inputs.commit_sha || 'v1' }}
+
+      - name: Check for existing release/v1-candidate branch
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          if git ls-remote --exit-code --heads origin release/v1-candidate &>/dev/null; then
+            echo "Error: release/v1-candidate branch already exists"
+            echo "Please finalize or delete the existing release candidate before starting a new one"
+            exit 1
+          fi
+
+      - name: Create and push release/v1-candidate branch
+        run: |
+          git checkout -b release/v1-candidate
+          git push origin release/v1-candidate
+          echo "Created branch: release/v1-candidate"
+
+      - name: Trigger Release Please
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh workflow run release-v1-please.yml --repo ${{ github.repository }} --ref release/v1-candidate
+          echo "Triggered Release Please workflow for v1"

.github/workflows/release-v2-finalize.yml → .github/workflows/release-v1-finalize.yml

@@ -1,12 +1,12 @@
-# Step 4 (v2): Triggers when the changelog PR is merged to release/v2-candidate.
-# Records last-release-sha and renames release/v2-candidate to release/v{version}.
-name: "Release v2: Finalize"
+# Step 4 (v1): Triggers when the changelog PR is merged to release/v1-candidate.
+# Records last-release-sha and renames release/v1-candidate to release/v{version}.
+name: "Release v1: Finalize"
 
 on:
   pull_request:
     types: [closed]
     branches:
-      - release/v2-candidate
+      - release/v1-candidate
 
 permissions:
   contents: write
@@ -32,15 +32,15 @@ jobs:
       - uses: actions/checkout@v6
         if: steps.check.outputs.is_release_pr == 'true'
         with:
-          ref: release/v2-candidate
+          ref: release/v1-candidate
           token: ${{ secrets.RELEASE_PAT }}
           fetch-depth: 0
 
       - name: Extract version from manifest
         if: steps.check.outputs.is_release_pr == 'true'
         id: version
         run: |
-          VERSION=$(jq -r '.["."]' .github/.release-please-manifest-v2.json)
+          VERSION=$(jq -r '.["."]' .github/.release-please-manifest-v1.json)
           echo "version=$VERSION" >> $GITHUB_OUTPUT
           echo "Extracted version: $VERSION"
 
@@ -56,21 +56,21 @@ jobs:
       - name: Record last-release-sha for release-please
         if: steps.check.outputs.is_release_pr == 'true'
         run: |
-          git fetch origin v2
-          CUT_SHA=$(git merge-base origin/v2 HEAD)
-          echo "Release was cut from v2 at: $CUT_SHA"
+          git fetch origin v1
+          CUT_SHA=$(git merge-base origin/v1 HEAD)
+          echo "Release was cut from v1 at: $CUT_SHA"
           jq --arg sha "$CUT_SHA" '. + {"last-release-sha": $sha}' \
-            .github/release-please-config-v2.json > tmp.json && mv tmp.json .github/release-please-config-v2.json
-          git add .github/release-please-config-v2.json
-          git commit -m "chore: update last-release-sha for next v2 release"
-          git push origin release/v2-candidate
+            .github/release-please-config-v1.json > tmp.json && mv tmp.json .github/release-please-config-v1.json
+          git add .github/release-please-config-v1.json
+          git commit -m "chore: update last-release-sha for next v1 release"
+          git push origin release/v1-candidate
 
-      - name: Rename release/v2-candidate to release/v{version}
+      - name: Rename release/v1-candidate to release/v{version}
         if: steps.check.outputs.is_release_pr == 'true'
         run: |
           VERSION="v${STEPS_VERSION_OUTPUTS_VERSION}"
-          git push origin "release/v2-candidate:refs/heads/release/$VERSION" ":release/v2-candidate"
-          echo "Renamed release/v2-candidate to release/$VERSION"
+          git push origin "release/v1-candidate:refs/heads/release/$VERSION" ":release/v1-candidate"
+          echo "Renamed release/v1-candidate to release/$VERSION"
         env:
           STEPS_VERSION_OUTPUTS_VERSION: ${{ steps.version.outputs.version }}
 
@@ -79,6 +79,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
+          gh label create "autorelease: tagged" --color "EDEDED" --description "Tagged release" || true
           gh pr edit ${{ github.event.pull_request.number }} \
             --remove-label "autorelease: pending" \
             --add-label "autorelease: tagged"

.github/workflows/release-v2-please.yml → .github/workflows/release-v1-please.yml

@@ -1,10 +1,10 @@
-# Runs release-please to create/update a PR with version bump and changelog for v2.
-# Triggered only by workflow_dispatch (from release-v2-cut.yml).
+# Runs release-please to create/update a PR with version bump and changelog for v1.
+# Triggered only by workflow_dispatch (from release-v1-cut.yml).
 # Does NOT auto-run on push to preserve manual changelog edits after cherry-picks.
-name: "Release v2: Please"
+name: "Release v1: Please"
 
 on:
-  # Only run via workflow_dispatch (triggered by release-v2-cut.yml)
+  # Only run via workflow_dispatch (triggered by release-v1-cut.yml)
   workflow_dispatch:
 
 permissions:
@@ -15,27 +15,27 @@ jobs:
   release-please:
     runs-on: ubuntu-latest
     steps:
-      - name: Check if release/v2-candidate still exists
+      - name: Check if release/v1-candidate still exists
         id: check
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          if gh api repos/${{ github.repository }}/branches/release/v2-candidate --silent 2>/dev/null; then
+          if gh api repos/${{ github.repository }}/branches/release/v1-candidate --silent 2>/dev/null; then
             echo "exists=true" >> $GITHUB_OUTPUT
           else
-            echo "release/v2-candidate branch no longer exists, skipping"
+            echo "release/v1-candidate branch no longer exists, skipping"
             echo "exists=false" >> $GITHUB_OUTPUT
           fi
 
       - uses: actions/checkout@v6
         if: steps.check.outputs.exists == 'true'
         with:
-          ref: release/v2-candidate
+          ref: release/v1-candidate
 
       - uses: googleapis/release-please-action@v4
         if: steps.check.outputs.exists == 'true'
         with:
           token: ${{ secrets.RELEASE_PAT }}
-          config-file: .github/release-please-config-v2.json
-          manifest-file: .github/.release-please-manifest-v2.json
-          target-branch: release/v2-candidate
+          config-file: .github/release-please-config-v1.json
+          manifest-file: .github/.release-please-manifest-v1.json
+          target-branch: release/v1-candidate

.github/workflows/release-v2-publish.yml → .github/workflows/release-v1-publish.yml

@@ -1,8 +1,8 @@
-# Step 6 (v2): Builds and publishes the v2 package to PyPI from a release/v{version} branch.
-# Reads version from .release-please-manifest-v2.json, converts to PEP 440,
+# Step 6 (v1): Builds and publishes the v1 package to PyPI from a release/v{version} branch.
+# Reads version from .release-please-manifest-v1.json, converts to PEP 440,
 # updates version.py, then builds and publishes.
-# Creates a merge-back PR (step 7) to sync release changes to v2.
-name: "Release v2: Publish to PyPi"
+# Creates a merge-back PR (step 7) to sync release changes to v1.
+name: "Release v1: Publish to PyPi"
 
 on:
   workflow_dispatch:
@@ -18,7 +18,7 @@ jobs:
       - name: Validate branch
         run: |
           if [[ ! "${GITHUB_REF_NAME}" =~ ^release/v[0-9]+\.[0-9]+\.[0-9]+ ]]; then
-            echo "Error: Must run from a release/v* branch (e.g., release/v2.0.0-alpha.2)"
+            echo "Error: Must run from a release/v* branch (e.g., release/v1.34.1)"
             exit 1
           fi
 
@@ -27,15 +27,15 @@ jobs:
       - name: Extract version from manifest and convert to PEP 440
         id: version
         run: |
-          VERSION=$(jq -r '.["."]' .github/.release-please-manifest-v2.json)
+          VERSION=$(jq -r '.["."]' .github/.release-please-manifest-v1.json)
           echo "semver=$VERSION" >> $GITHUB_OUTPUT
           echo "Semver version: $VERSION"
 
           # Convert semver pre-release to PEP 440:
-          #   2.0.0-alpha.1 -> 2.0.0a1
-          #   2.0.0-beta.1  -> 2.0.0b1
-          #   2.0.0-rc.1    -> 2.0.0rc1
-          #   2.0.0         -> 2.0.0 (no change for stable)
+          #   1.35.0-alpha.1 -> 1.35.0a1
+          #   1.35.0-beta.1  -> 1.35.0b1
+          #   1.35.0-rc.1    -> 1.35.0rc1
+          #   1.35.0         -> 1.35.0 (no change for stable)
           PEP440=$(echo "$VERSION" | sed -E 's/-alpha\./a/; s/-beta\./b/; s/-rc\./rc/')
           echo "pep440=$PEP440" >> $GITHUB_OUTPUT
           echo "PEP 440 version: $PEP440"
@@ -73,7 +73,7 @@ jobs:
           PEP440_VERSION: ${{ steps.version.outputs.pep440 }}
         run: |
           gh pr create \
-            --base v2 \
+            --base v1 \
             --head "${GITHUB_REF_NAME}" \
-            --title "chore: merge release v${PEP440_VERSION} to v2" \
-            --body "Syncs version bump and CHANGELOG from release v${SEMVER_VERSION} to v2."
+            --title "chore: merge release v${PEP440_VERSION} to v1" \
+            --body "Syncs version bump and CHANGELOG from release v${SEMVER_VERSION} to v1."