RFR: 2082: Use correct .jcheck/conf in AdditionalConfiguration.java

Zhao Song zsong at openjdk.org
Fri Oct 27 17:49:29 UTC 2023


On Fri, 27 Oct 2023 13:26:41 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Hi all,
>> 
>> please review this patch that ensures that we pass the correct `.jcheck/conf` to [AdditionalConfiguration.java](https://github.com/openjdk/skara/blob/master/bots/pr/src/main/java/org/openjdk/skara/bots/pr/AdditionalConfiguration.java). The `.jcheck/conf` should either come from the "overriding" `.jcheck/conf` (if the PR bot is configured to use that) or the pull request's target branch.
>> 
>> I have added that test that passes with this patch but fails without it.
>> 
>> Thanks,
>> Erik
>
> bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1274:
> 
>> 1272:                         pr.repository().forge().currentUser(), comments, reviewMerge);
>> 1273:                 checkablePullRequest.executeChecks(localHash, censusInstance, visitor, additionalConfiguration, jcheckConfHash);
>> 1274:                 // Don't need to run the second round if confOverride is set.
> 
> Strictly speaking, should we regenerate the AdditionalConfiguration for the second run where we use the merged .jcheck/conf?

Oh, right, I overlooked it when I was implementing the second run of jcheck feature.

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1578#discussion_r1374881522


More information about the skara-dev mailing list