Fix bug where release-please is looking at extra files from target branch instead of the one where changes are located #12
Conversation
| @@ -1280,7 +1226,7 @@ export class GitHub { | |||
| updates: Update[], | |||
| options?: CreatePullRequestOptions | |||
| ): Promise<PullRequest> => { | |||
| const changes = await this.buildChangeSet(updates, baseBranch); | |||
| const changes = await this.buildChangeSet(updates, refBranch); | |||
There was a problem hiding this comment.
@RobertCraigie I didn't test yet, but I believe this fixes the problem.
I will update the release branch and try again with the java sink repo, based on my changes.
dgellow
changed the title
| this.addPath(yamlPath) | ||
| ); | ||
| const contents: GitHubFileContents = | ||
| await this.github.getFileContentsOnBranch( |
There was a problem hiding this comment.
nit: I think it would be cleaner to just use the changes branch as a default but I don't feel strongly.
Separately, does this PR mean that it's very difficult / impossible to do the wrong thing? i.e. you can't accidentally fetch from the wrong branch?
There was a problem hiding this comment.
I hope so, I checked for everything I could see that seems to be "defaultBranch", "targetBranch", "baseBranch" that I may have missed. But release-please has been built with the assumption the default branch is both the branch PRs should target against and the branch from which PRs, so it's still possible we may be missing a few other places.
|
Yeah, that fixed the problem :D |
|
And the release is correct too, just to be sure: https://github.com/stainless-sdks/sink-java-public/compare/v0.1.0...v0.1.1 I will merge this fix. |
dgellow
deleted the
sam/sta-2088-release-please-changelog-compares-readme-against-main
branch
Looking at the diff at https://github.com/stainless-sdks/sink-kotlin-public/pull/59/commits/a62d9a1df3030a35e27d6f3949afd951f2dd7010#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5 it seems that we aren't comparing against the correct branch when creating the changelog commit as part of a release PR. That means that any changes from
extra-files(i.e a release-please config key specifying extra files to update) are reversed.