ci: use main as integration branch

Author: nagug

.github/workflows/auto-sync.yml

@@ -3,7 +3,7 @@ name: auto-sync-upstream
 # Automatically syncs the fork with upstream google/adk-python.
 #
 # Flow:
-#   1. Merge upstream/main into feature/base-url (the integration branch).
+#   1. Merge upstream into main (the integration branch).
 #   2. If the merge conflicts -> stop, open an issue, leave `stable` untouched.
 #   3. If clean -> install + run the model tests.
 #   4. Tests pass -> fast-forward `stable` to the new commit (the new baseline).
@@ -22,15 +22,15 @@ on:
   workflow_dispatch: {}
 
 permissions:
-  contents: write   # push feature/base-url and stable
+  contents: write   # push main and stable
   issues: write     # open the failure-report issue
 
 concurrency:
   group: auto-sync
   cancel-in-progress: false
 
 env:
-  INTEGRATION_BRANCH: feature/base-url
+  INTEGRATION_BRANCH: main
   STABLE_BRANCH: stable
   UPSTREAM_REPO: https://github.com/google/adk-python.git
 
@@ -41,7 +41,7 @@ jobs:
       - name: Checkout integration branch (full history)
         uses: actions/checkout@v4
         with:
-          ref: feature/base-url
+          ref: main
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/fork-ci.yml

@@ -7,9 +7,9 @@ name: fork-ci
 
 on:
   push:
-    branches: [feature/base-url]
+    branches: [main]
   pull_request:
-    branches: [feature/base-url]
+    branches: [main]
   schedule:
     - cron: '0 6 * * 1'  # Mondays 06:00 UTC
   workflow_dispatch: {}

FORK.md

@@ -83,8 +83,8 @@ agent = Agent(model=Gemini(model="gemini-2.5-flash"))
 
 | Branch            | Role |
 |-------------------|------|
-| `feature/base-url`| Integration branch — the base_url patch with upstream **merged in**. |
-| `stable`          | What consumers pin. Only ever advances to a green `feature/base-url`. |
+| `main`| Integration branch — the base_url patch with upstream **merged in**. |
+| `stable`          | What consumers pin. Only ever advances to a green `main`. |
 
 There is no `upstream` remote in the repo; the automation adds it on the fly.
 The patch is carried by **merging upstream in** (not rebasing) so history is
@@ -95,10 +95,10 @@ never rewritten and `@stable` pins never shift unexpectedly.
 [`.github/workflows/auto-sync.yml`](.github/workflows/auto-sync.yml) runs every
 Monday (and on demand via *Actions → auto-sync-upstream → Run workflow*):
 
-1. Merge `upstream/main` into `feature/base-url`.
+1. Merge `upstream/main` into `main`.
 2. **Merge conflicts** → stop, open an `auto-sync` issue, leave `stable` as-is.
 3. Clean merge → install and run the model test suite.
-4. **Tests pass** → push `feature/base-url` and fast-forward `stable` to it.
+4. **Tests pass** → push `main` and fast-forward `stable` to it.
    This is the new baseline; `@stable` consumers pick it up automatically.
 5. **Tests fail** → stop, open an `auto-sync` issue, leave `stable` as-is.
 
@@ -113,14 +113,14 @@ When the `auto-sync` issue appears:
 ```bash
 ./scripts/update-fork.sh        # merges upstream, runs tests locally
 # resolve the conflict / fix the failing test, then:
-git push origin feature/base-url
-git push origin feature/base-url:stable   # fast-forward stable once green
+git push origin main
+git push origin main:stable   # fast-forward stable once green
 ```
 
 Optionally snapshot a release: `git tag -a fork-vX.Y.Z -m "..." && git push origin fork-vX.Y.Z`.
 
 ### CI
 
 [`.github/workflows/fork-ci.yml`](.github/workflows/fork-ci.yml) additionally
-runs the model tests on every push to `feature/base-url`, so manual pushes are
+runs the model tests on every push to `main`, so manual pushes are
 checked too.

scripts/update-fork.sh

@@ -4,13 +4,13 @@
 # Mirrors what .github/workflows/auto-sync.yml does, for local recovery when
 # an automated sync fails (merge conflict or red tests).
 #
-#   feature/base-url = integration branch (base_url patch + upstream merged in)
+#   main = integration branch (base_url patch + upstream merged in)
 #   stable           = what consumers pin; advance it only when tests pass
 #
 # Usage: ./scripts/update-fork.sh
 set -euo pipefail
 
-INTEGRATION_BRANCH="feature/base-url"
+INTEGRATION_BRANCH="main"
 
 # Ensure an `upstream` remote exists.
 if ! git remote get-url upstream >/dev/null 2>&1; then