<div dir="ltr">Thanks Erik, I can confirm the issue is fixed.<div><br></div><div>- Johan</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Apr 26, 2024 at 3:32 PM <<a href="mailto:erik.joelsson@oracle.com">erik.joelsson@oracle.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><u></u>
<div>
<div>On 4/25/24 11:46,
<a href="mailto:erik.joelsson@oracle.com" target="_blank">erik.joelsson@oracle.com</a> wrote:<br>
</div>
<blockquote type="cite">
<p><br>
</p>
<div>On 4/25/24 10:05, Johan Vos wrote:<br>
</div>
<blockquote type="cite">
<div dir="ltr">Thanks for the investigation. That makes sense
indeed, I didn't spot the openjdk-bot versus openjdk-bots
difference.
<div>I see that the previous PR (22) has been closed, and a
new PR (23) is created, but that is still created from <a href="https://urldefense.com/v3/__https://github.com/openjdk-bot/mobile/tree/3__;!!ACWV5N9M2RV99hQ!ILbuREdYo9Ruus9faf7UNhkM9iwSvcN0mL_jZJo8WT-ZFEtIFsx7m6oM-qUN5er3xlxhSrYYufzm2nEiUUaW80Y$" target="_blank">https://github.com/openjdk-bot/mobile/tree/3</a>
(without s) .</div>
<div>The instructions mention the repository at openjdk-bots
(with s), so I assume I should also close this PR? (I'm not
in a hurry so I'll not touch it as to not confuse the bot).</div>
<div><br>
</div>
</div>
</blockquote>
<p>I tried closing 22 to see if the bot would generate the next
one correctly. When it generated 23 with the same issue still
present I dug deeper into the source code and found the actual
problem (detailed below). Closing 23 will not help at this
point. We need to fix <a href="https://bugs.openjdk.org/browse/SKARA-2242" target="_blank">SKARA-2242</a>.</p>
</blockquote>
<p>I have deployed the fix to SKARA-2242, closed pull 23 and the bot
has now created pull 24 which looks correct. There are just a few
conflicts.<br>
</p>
<p>/Erik<br>
</p>
<blockquote type="cite">
<p>/Erik<br>
</p>
<blockquote type="cite">
<div dir="ltr">
<div>Thanks a lot!</div>
<div><br>
</div>
<div>- Johan </div>
</div>
<br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Thu, Apr 25, 2024 at
2:40 PM <<a href="mailto:erik.joelsson@oracle.com" target="_blank">erik.joelsson@oracle.com</a>>
wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On
4/25/24 05:34, <a href="mailto:erik.joelsson@oracle.com" target="_blank">erik.joelsson@oracle.com</a>
wrote:<br>
> Hello Johan,<br>
><br>
> (I finally had some time to look at this today)<br>
><br>
> I recently changed the fork repository that the bot
should be creating <br>
> these PRs from. It used to be
"openjdk-bot/<repo>" but it's now <br>
> "openjdk-bots/<repo>", note the "s". In this PR
the actual source repo <br>
> is the old "openjdk-bot" but the body text has
"openjdk-bots" in the <br>
> instructions. The branch name is calculated based on
the number of <br>
> branches present in the fork, so the number 2 indicates
that it was <br>
> based on the new "openjdk-bots" repo, but still the PR
has <br>
> "openjdk-bot/mobile" as the source. I'm puzzled and
don't know how <br>
> this could have happened.<br>
><br>
I believe this was caused by me changing the bot
configuration, but this <br>
bot had cached local repositories in its private scratch
work area, and <br>
those cached repositories had remotes still pointing to the
old fork. I <br>
have deleted all cached data, and restarted the bot, but
this PR is <br>
still broken and need to be closed.<br>
<br>
/Erik<br>
<br>
> /Erik<br>
><br>
> On 4/25/24 00:25, Johan Vos wrote:<br>
>> Until recently, all PR's from the openjdk-bots that
were created to <br>
>> allow solving conflicts when merging commits from
openjdk/jdk:HEAD <br>
>> into openjdk/mobile:HEAD went fine.<br>
>> The last PR that was created though [1], seems to
be weird and I <br>
>> wonder if there is something wrong with the PR
generation.<br>
>><br>
>> From the github website, it seems there are 25
files with a conflict, <br>
>> although that does not seem to be true when I
compared them manually.<br>
>> The usual process of fixing the merge conflicts and
pushing them to <br>
>> the openjdk-bots/mobile:+2 branch did not trigger
the next steps in <br>
>> the PR on openjdk/mobile.<br>
>><br>
>> What surprises me is that the latest branch in the
<br>
>> openjdk-bots/mobile repository has the name "2". In
the past, those <br>
>> branches had incremental names, and the previous
branch was named <br>
>> "14". I expected to see a branch named "15" but the
PR was raised <br>
>> from a branch named "2" which is 27772 commits
behind the master of <br>
>> openjdk/mobile.<br>
>><br>
>> - Johan<br>
>><br>
>> [1] <a href="https://urldefense.com/v3/__https://github.com/openjdk/mobile/pull/22__;!!ACWV5N9M2RV99hQ!ILbuREdYo9Ruus9faf7UNhkM9iwSvcN0mL_jZJo8WT-ZFEtIFsx7m6oM-qUN5er3xlxhSrYYufzm2nEijHcQUxg$" rel="noreferrer" target="_blank">https://github.com/openjdk/mobile/pull/22</a><br>
>> [2] <a href="https://urldefense.com/v3/__https://github.com/openjdk-bot/mobile/tree/14__;!!ACWV5N9M2RV99hQ!ILbuREdYo9Ruus9faf7UNhkM9iwSvcN0mL_jZJo8WT-ZFEtIFsx7m6oM-qUN5er3xlxhSrYYufzm2nEiRRlzSio$" rel="noreferrer" target="_blank">https://github.com/openjdk-bot/mobile/tree/14</a><br>
</blockquote>
</div>
</blockquote>
</blockquote>
</div>
</blockquote></div>