Skip to content

use the cla user #8806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattKorwel merged 2 commits into from
Sep 19, 2025
Merged

use the cla user #8806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff4ac40
use the cla user
mattKorwel Sep 19, 2025
c8775f2
docs
mattKorwel Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/workflows/release-patch-1-create-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,15 @@ jobs:
- name: 'Install Dependencies'
run: 'npm ci'

- name: 'Generate GitHub App Token'
id: 'generate_token'
uses: 'actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b'
with:
app-id: '${{ secrets.APP_ID }}'
private-key: '${{ secrets.PRIVATE_KEY }}'
permission-pull-requests: 'write'
permission-contents: 'write'

- name: 'Configure Git User'
run: |-
git config user.name "gemini-cli-robot"
Expand All @@ -59,7 +68,7 @@ jobs:
- name: 'Create Patch'
id: 'create_patch'
env:
GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
GH_TOKEN: '${{ steps.generate_token.outputs.token }}'
continue-on-error: true
run: |
# Capture output directly to environment variable
Expand Down
33 changes: 33 additions & 0 deletions docs/releases.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,39 @@ Review the automatically created pull request(s) to ensure the cherry-pick was s

**Security Note:** The `release/*` branches are protected by branch protection rules. A pull request to one of these branches requires at least one review from a code owner before it can be merged. This ensures that no unauthorized code is released.

#### 2.5. Adding Multiple Commits to a Hotfix (Advanced)
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Sep 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The numbering of this section, 2.5., is inconsistent with the document's structure. The preceding sections are 1. and 2., and the following is 3.. For clarity in this critical release process documentation, this section should be renumbered to 3., and the subsequent 'Automatic Release' section should be renumbered to 4..

Suggested change
#### 2.5. Adding Multiple Commits to a Hotfix (Advanced)
#### 3. Adding Multiple Commits to a Hotfix (Advanced)


If you need to include multiple fixes in a single patch release, you can add additional commits to the hotfix branch after the initial patch PR has been created:

1. **Start with the primary fix**: Use `/patch` (or `/patch both`) on the most important PR to create the initial hotfix branch and PR.

2. **Checkout the hotfix branch locally**:

```bash
git fetch origin
git checkout hotfix/v0.5.1/stable/cherry-pick-abc1234 # Use the actual branch name from the PR
```

3. **Cherry-pick additional commits**:

```bash
git cherry-pick <commit-sha-1>
git cherry-pick <commit-sha-2>
# Add as many commits as needed
```

4. **Push the updated branch**:

```bash
git push origin hotfix/v0.5.1/stable/cherry-pick-abc1234
```

5. **Test and review**: The existing patch PR will automatically update with your additional commits. Test thoroughly since you're now releasing multiple changes together.

6. **Update the PR description**: Consider updating the PR title and description to reflect that it includes multiple fixes.

This approach allows you to group related fixes into a single patch release while maintaining full control over what gets included and how conflicts are resolved.

#### 3. Automatic Release

Upon merging the pull request, the `Release: Patch (2) Trigger` workflow is automatically triggered. It will then start the `Release: Patch (3) Release` workflow, which will:
Expand Down
Loading