Fix: Changelog generator action frfr no cap #6659
Merged
+25
−17
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously it was causing issues for the changelog generator, since it "couldn't find a common ancestor" when the version was updated and commited first. Moving the version update to happen after resolves this, and is PR'd to the same branch so that these changes happen at once. I fear this might still lead to the same issue of common ancestor, but we're merging into main, and then branching to the release branch, so hopefully that doesn't happen?
kalanchan
approved these changes
Jan 15, 2025
|
The backport to To backport this PR manually, you can either: Via the sg toolUse the sg backport -r vscode-v1.60.x -p 6659Via your terminalTo backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-vscode-v1.60.x vscode-v1.60.x
# Navigate to the new working tree
cd .worktrees/backport-vscode-v1.60.x
# Create a new branch
git switch --create backport-6659-to-vscode-v1.60.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 bdcfb73214d717ef9c02a1ef594fc23362dd5014
# Push it to GitHub
git push --set-upstream origin backport-6659-to-vscode-v1.60.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-vscode-v1.60.xIf you encouter conflict, first resolve the conflict and stage all files, then run the commands below: git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-6659-to-vscode-v1.60.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-vscode-v1.60.x
Once the pull request has been created, please ensure the following:
|
jamesmcnamara
pushed a commit
that referenced
this pull request
Jan 15, 2025
- **Moved the version update to happen _after_ changelog** - **misc: remove extra debugging logs** Finally!!! :party: I've run the [action](https://github.com/sourcegraph/cody/actions/runs/12797290344/job/35678849540) and it's successfully generated the [changelog](#6658) and version update in a single PR <!-- Required. See https://docs-legacy.sourcegraph.com/dev/background-information/testing_principles. -->
jamesmcnamara
added a commit
that referenced
this pull request
Jan 15, 2025
) - **Moved the version update to happen _after_ changelog** - **misc: remove extra debugging logs** Finally!!! :party: I've run the [action](https://github.com/sourcegraph/cody/actions/runs/12797290344/job/35678849540) and it's successfully generated the [changelog](#6658) and version update in a single PR <!-- Required. See https://docs-legacy.sourcegraph.com/dev/background-information/testing_principles. --> ## Test plan <!-- Required. See https://docs-legacy.sourcegraph.com/dev/background-information/testing_principles. --> Co-authored-by: Anish Lakhwara <anish+github@lakhwara.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Finally!!! :party:
Test plan
I've run the action and it's successfully generated the changelog and version update in a single PR