Merge remote-tracking branch 'upstream/main' into upgrade_xcode_test

Author: okorohelijah

.ci/flutter_master.version

@@ -1 +1 @@
-82d96ef98a33f3f35dabf7795e701f8a4d2d4bec
+fb03253e32ce6aba92872ed9c1224e999ec6abcb

.ci/flutter_stable.version

@@ -1 +1 @@
-2c9eb20739dfec95e2c74bd3dfa4601b0a8a36aa
+db50e20168db8fee486b9abf32fc912de3bc5b6a

.github/workflows/batch_release_pr.yml

@@ -26,8 +26,8 @@ jobs:
       # In that case, the workflow will exit and complete successfully.
       - name: create batch release branch
         run: |
-          git config --global user.name ${{ secrets.USER_NAME }}
-          git config --global user.email ${{ secrets.USER_EMAIL }}
+          git config --global user.name "flutteractionsbot"
+          git config --global user.email "fluttergithubbot@gmail.com"
           dart ./script/tool/lib/src/main.dart branch-for-batch-release --packages=${GITHUB_EVENT_CLIENT_PAYLOAD_PACKAGE} --branch=${BRANCH_NAME} --remote=origin
         env:
           GITHUB_EVENT_CLIENT_PAYLOAD_PACKAGE: ${{ github.event.client_payload.package }}
@@ -57,7 +57,7 @@ jobs:
           ref: ${{ env.BRANCH_NAME }}
       - name: Create batch release PR
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.FLUTTERGITHUBBOT_TOKEN }}
         run: |
           gh pr create \
             --base "release-${{ github.event.client_payload.package }}" \

.github/workflows/release.yml

@@ -40,7 +40,7 @@ jobs:
     # because there doesn't appear to be anything to wait for. To avoid that,
     # explicitly wait for one LUCI test by name first.
     - name: Wait for test check-in
-      uses: lewagon/wait-on-check-action@74049309dfeff245fe8009a0137eacf28136cb3c
+      uses: lewagon/wait-on-check-action@a08fbe2b86f9336198f33be6ad9c16b96f92799c
       with:
         ref: ${{ github.sha }}
         check-name: 'Linux ci_yaml packages roller'
@@ -52,7 +52,7 @@ jobs:
 
     # This workflow should be the last to run. So wait for all the other tests to succeed.
     - name: Wait on all tests
-      uses: lewagon/wait-on-check-action@74049309dfeff245fe8009a0137eacf28136cb3c
+      uses: lewagon/wait-on-check-action@a08fbe2b86f9336198f33be6ad9c16b96f92799c
       with:
         ref: ${{ github.sha }}
         running-workflow-name: 'release'

.github/workflows/release_from_branches.yml

@@ -3,9 +3,12 @@ on:
   push:
     branches:
       - 'release-go_router'
+permissions:
+  # Release needs to push a tag back to the repo.
+  contents: write
 jobs:
   release:
-    uses: ./.github/workflows/resuable_release.yml
+    uses: ./.github/workflows/reusable_release.yml
     with:
       is-batch-release: true
       branch-name: '${{ github.ref_name }}'

.github/workflows/reusable_release.yml

@@ -8,8 +8,6 @@ on:
       branch-name:
         required: true
         type: string
-# Declare default permissions as read only.
-permissions: read-all
 jobs:
   release:
     if: github.repository_owner == 'flutter'
@@ -44,7 +42,7 @@ jobs:
     # because there doesn't appear to be anything to wait for. To avoid that,
     # explicitly wait for one LUCI test by name first.
     - name: Wait for test check-in
-      uses: lewagon/wait-on-check-action@74049309dfeff245fe8009a0137eacf28136cb3c
+      uses: lewagon/wait-on-check-action@a08fbe2b86f9336198f33be6ad9c16b96f92799c
       with:
         ref: ${{ github.sha }}
         check-name: 'Linux ci_yaml packages roller'
@@ -56,7 +54,7 @@ jobs:
 
     # This workflow should be the last to run. So wait for all the other tests to succeed.
     - name: Wait on all tests
-      uses: lewagon/wait-on-check-action@74049309dfeff245fe8009a0137eacf28136cb3c
+      uses: lewagon/wait-on-check-action@a08fbe2b86f9336198f33be6ad9c16b96f92799c
       with:
         ref: ${{ github.sha }}
         running-workflow-name: 'release'

.github/workflows/sync_release_pr.yml

@@ -3,7 +3,7 @@ name: "Sync Release to Main"
 on:
   push:
     branches:
-    # As packages opt into batched releases, they need to be added here
+      # As packages opt into batched releases, they need to be added here
       - 'release-go_router'
 
 jobs:
@@ -16,11 +16,26 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        with:
+          fetch-depth: 0 # Fetch history to allow branch comparison
 
       - name: Create Pull Request
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.FLUTTERGITHUBBOT_TOKEN }}
         run: |
+          # 1. Fetch main so the runner can see the difference
+          git fetch origin main
+
+          # 2. Verify there are actually new commits to sync
+          # This prevents the "GraphQL: No commits between main..." error
+          COMMITS_COUNT=$(git rev-list --count origin/main..HEAD)
+
+          if [ "$COMMITS_COUNT" -eq "0" ]; then
+            echo "No new commits found on ${{ github.ref_name }} compared to main. Nothing to sync."
+            exit 0
+          fi
+
+          # 3. Create the PR directly
           gh pr create \
             --base "main" \
             --head "${{ github.ref_name }}" \