Merge branch 'main' into control-custom-update

Author: sascala

.github/blunderbuss.yml

@@ -15,4 +15,4 @@
 assign_issues:
   - googlemaps/devrel
 assign_prs:
-  - googlemaps/devrel
+  - googlemaps/devrel

.github/dependabot.yml

@@ -20,4 +20,4 @@ updates:
       interval: "weekly"
     ignore:
       - dependency-name: "three"
-      - dependency-name: "@types/three"
+      - dependency-name: "@types/three"

.github/header-checker-lint.yml

@@ -14,4 +14,4 @@ sourceFileExtensions:
   - .sh
   - .swift
   - .ts
-  - .yml
+  - .yml

.github/snippet-bot.yml

@@ -1,3 +1,3 @@
 alwaysCreateStatusCheck: true
 ignoreFiles:
-- "samples/*.sh"
+  - "samples/*.sh"

.github/workflows/approve-merge.yml

@@ -36,7 +36,7 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.ref }} # Checkout the PR's head commit
           token: ${{ secrets.GH_MERGE_TOKEN }}
-          
+
       - name: Approve PR
         run: gh pr review --approve "$PR_URL"
         env:

.github/workflows/dist-pr.yml

@@ -12,41 +12,93 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Create release PR for dist
+name: Create, approve, and merge release PR for dist
 
 on:
   workflow_dispatch:
     inputs:
       source_run_id:
-        description: 'ID of the upstream workflow run that triggered this'
+        description: "ID of the upstream workflow run that triggered this"
         required: false
         type: string
 
 jobs:
-  create-pr:
+  create-approve-merge-pr:
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
       contents: write
+
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.GH_MERGE_TOKEN }}
-          fetch-depth: 0 # Fetch all history
+          fetch-depth: 0
 
       - name: Set Git Identity
         run: |
           git config --global user.name 'googlemaps-bot'
           git config --global user.email 'googlemaps-bot@google.com'
 
+      - name: Ensure temp branch exists on origin
+        run: |
+          git fetch origin temp-build-branch:temp-build-branch
+          git ls-remote --exit-code --heads origin temp-build-branch
+
+      - name: Find existing PR
+        id: find_pr
+        env:
+          GH_TOKEN: ${{ secrets.GH_MERGE_TOKEN }}
+        run: |
+          PR_URL="$(gh pr list \
+            --base main \
+            --head temp-build-branch \
+            --state open \
+            --json url \
+            --jq '.[0].url')"
+
+          if [ -n "$PR_URL" ] && [ "$PR_URL" != "null" ]; then
+            echo "pr_url=$PR_URL" >> "$GITHUB_OUTPUT"
+            echo "pr_exists=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "pr_exists=false" >> "$GITHUB_OUTPUT"
+          fi
+
       - name: Create Pull Request
+        id: create_pr
+        if: steps.find_pr.outputs.pr_exists != 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GH_MERGE_TOKEN }}
         run: |
-          gh pr create \
+          PR_URL="$(gh pr create \
             --base main \
             --head temp-build-branch \
             --title "chore: automated output update (dist)" \
             --body "This PR contains updated build output from the dist branch." \
-            --label "automated pr,dist-update"
+            --label "automated pr" \
+            --label "dist-update")"
+          echo "pr_url=$PR_URL" >> "$GITHUB_OUTPUT"
+
+      - name: Determine PR URL
+        id: pr
+        run: |
+          if [ "${{ steps.find_pr.outputs.pr_exists }}" = "true" ]; then
+            echo "pr_url=${{ steps.find_pr.outputs.pr_url }}" >> "$GITHUB_OUTPUT"
+          else
+            echo "pr_url=${{ steps.create_pr.outputs.pr_url }}" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Approve PR
         env:
-          GH_TOKEN: ${{ secrets.GH_MERGE_TOKEN }}
+          PR_URL: ${{ steps.pr.outputs.pr_url }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr review --approve "$PR_URL"
+
+      - name: Enable auto-merge
+        env:
+          PR_URL: ${{ steps.pr.outputs.pr_url }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr merge --auto --squash --delete-branch "$PR_URL"

.github/workflows/playwright.yml

@@ -19,7 +19,7 @@ on:
     branches:
       - main
     paths:
-      - 'samples/**'
+      - "samples/**"
 
 jobs:
   release:
@@ -49,9 +49,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: '22.x'
+          node-version: "24.x"
 
       - run: npm i
 
@@ -93,7 +93,7 @@ jobs:
             echo "  - samples/$workspace"
             rm -rf dist/samples/$workspace
           done
-          
+
       - name: Generate Index
         run: bash samples/generate-index.sh
 
@@ -130,6 +130,6 @@ jobs:
         uses: benc-uk/workflow-dispatch@v1
         with:
           workflow: dist-pr.yml
-          ref: 'temp-build-branch'
+          ref: "main"
           token: ${{ secrets.GH_APPROVER_TOKEN }} # Use the same token that pushed, it needs 'workflows: write' permissions
           inputs: '{ "source_run_id": "${{ github.run_id }}" }' # Optional: Pass the run ID for traceability