From fcdfa8609a27ef34aa74b286e849c64be90a06da Mon Sep 17 00:00:00 2001 From: Tommaso Sciortino Date: Thu, 2 Oct 2025 15:01:42 -0700 Subject: [PATCH] Change "Create Pull Request" action to not try merging (#10379) --- .github/actions/create-pull-request/action.yml | 8 ++++---- .github/workflows/release-nightly.yml | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/actions/create-pull-request/action.yml b/.github/actions/create-pull-request/action.yml index d90d22315e..9e7f6346a7 100644 --- a/.github/actions/create-pull-request/action.yml +++ b/.github/actions/create-pull-request/action.yml @@ -1,5 +1,5 @@ -name: 'Create and Merge Pull Request' -description: 'Creates a pull request and merges it automatically.' +name: 'Create Pull Request' +description: 'Creates a pull request.' inputs: branch-name: @@ -33,7 +33,7 @@ runs: - name: '📝 Print Inputs' shell: 'bash' run: 'echo "${{ toJSON(inputs) }}"' - - name: 'Create and Approve Pull Request' + - name: 'Creates a Pull Request' if: "inputs.dry-run != 'true'" env: GH_TOKEN: '${{ inputs.github-token }}' @@ -51,4 +51,4 @@ runs: --base "${{ inputs.base-branch }}" \ --head "${{ inputs.branch-name }}" \ --fill) - gh pr merge "$PR_URL" --auto --squash + gh pr merge "$PR_URL" --auto diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml index a9518d5734..7cb5dee96f 100644 --- a/.github/workflows/release-nightly.yml +++ b/.github/workflows/release-nightly.yml @@ -103,13 +103,14 @@ jobs: previous-tag: '${{ steps.nightly_version.outputs.PREVIOUS_TAG }}' working-directory: './release' skip-branch-cleanup: true + force-skip-tests: '${{ github.event.inputs.force_skip_tests }}' gemini_api_key: '${{ secrets.GEMINI_API_KEY }}' - name: 'Create and Merge Pull Request' uses: './.github/actions/create-pull-request' with: branch-name: 'release/${{ steps.nightly_version.outputs.RELEASE_TAG }}' - pr-title: 'chore(release): bump version to ${{ steps.nightly_version.outputs.RELEASE_VERSION }}' + pr-title: 'chore/release: bump version to ${{ steps.nightly_version.outputs.RELEASE_VERSION }}' pr-body: 'Automated version bump for nightly release.' github-token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}' dry-run: '${{ github.event.inputs.dry_run }}'