MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-05-04 00:44:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Change "Create Pull Request" action to not try merging (#10379)

Browse Source
This commit is contained in:
Tommaso Sciortino
2025-10-02 15:01:42 -07:00
committed by GitHub
parent 4af89e944d
commit fcdfa8609a
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/actions/create-pull-request/action.yml
+4 -4
View File
@@ -1,5 +1,5 @@
name: 'Create and Merge Pull Request' name: 'Create Pull Request'
description: 'Creates a pull request and merges it automatically.' description: 'Creates a pull request.'
inputs: inputs:
branch-name: branch-name:
@@ -33,7 +33,7 @@ runs:
- name: '📝 Print Inputs' - name: '📝 Print Inputs'
shell: 'bash' shell: 'bash'
run: 'echo "${{ toJSON(inputs) }}"' run: 'echo "${{ toJSON(inputs) }}"'
- name: 'Create and Approve Pull Request' - name: 'Creates a Pull Request'
if: "inputs.dry-run != 'true'" if: "inputs.dry-run != 'true'"
env: env:
GH_TOKEN: '${{ inputs.github-token }}' GH_TOKEN: '${{ inputs.github-token }}'
@@ -51,4 +51,4 @@ runs:
--base "${{ inputs.base-branch }}" \ --base "${{ inputs.base-branch }}" \
--head "${{ inputs.branch-name }}" \ --head "${{ inputs.branch-name }}" \
--fill) --fill)
gh pr merge "$PR_URL" --auto --squash gh pr merge "$PR_URL" --auto
.github/workflows/release-nightly.yml
+2 -1
View File
@@ -103,13 +103,14 @@ jobs:
previous-tag: '${{ steps.nightly_version.outputs.PREVIOUS_TAG }}' previous-tag: '${{ steps.nightly_version.outputs.PREVIOUS_TAG }}'
working-directory: './release' working-directory: './release'
skip-branch-cleanup: true skip-branch-cleanup: true
force-skip-tests: '${{ github.event.inputs.force_skip_tests }}'
gemini_api_key: '${{ secrets.GEMINI_API_KEY }}' gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
- name: 'Create and Merge Pull Request' - name: 'Create and Merge Pull Request'
uses: './.github/actions/create-pull-request' uses: './.github/actions/create-pull-request'
with: with:
branch-name: 'release/${{ steps.nightly_version.outputs.RELEASE_TAG }}' 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.' pr-body: 'Automated version bump for nightly release.'
github-token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}' github-token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
dry-run: '${{ github.event.inputs.dry_run }}' dry-run: '${{ github.event.inputs.dry_run }}'