Integrated: 2131: Make second jcheck run work on merge-style PR

[Zhao Song]

On Tue, 2 Jan 2024 22:00:43 GMT, Zhao Song <zsong at openjdk.org> wrote:

> When testing [SKARA-2115](https://bugs.openjdk.org/browse/SKARA-2115), I find that if we change the jcheck conf in the source branch of a merge style PR. The pr will NOT run jcheck against the localJCheckConf(merged conf of source and target JCheckConf).
> After investigation, I realized that this bug exists since the first time we introduced the second jcheck run feature. This bug was partly fixed by introducing IsJCheckConfUpdatedInMergePR.
> However, IsJCheckConfUpdatedInMergePR will only be set correctly when workItem.bot.jcheckMerge() is true.
> To fix it, we should set isJCheckConfUpdatedInMergePR correctly when the PR is a merge-style PR.

This pull request has now been integrated.

Changeset: ef8238c3
Author:    Zhao Song <zsong at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/ef8238c35070094e979a13ad872d105f883f3881
Stats:     109 lines in 2 files changed: 99 ins; 8 del; 2 mod

2131: Make second jcheck run work on merge-style PR

Reviewed-by: erikj

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

PR: https://git.openjdk.org/skara/pull/1595