chore: merge main into generate-libraries-main

Author: cloud-java-bot

.github/scripts/update_generation_config.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 # This script should be run at the root of the repository.
 # This script is used to update googleapis_commitish, gapic_generator_version,
 # and libraries_bom_version in generation configuration at the time of running
@@ -174,4 +174,4 @@ if [ -z "${pr_num}" ]; then
 else
   git push
   gh pr edit "${pr_num}" --title "${title}" --body "${title}"
-fi
+fi

.github/workflows/update_generation_config.yaml

@@ -18,7 +18,6 @@ on:
   schedule:
   - cron: '0 2 * * *'
   workflow_dispatch:
-
 jobs:
   update-generation-config:
     runs-on: ubuntu-24.04
@@ -43,5 +42,4 @@ jobs:
           --base_branch "${base_branch}" \
           --repo ${{ github.repository }}
       env:
-        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-
+        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}