[External] : Re: Bot reusing branch names?

[Johan Vos]

Thanks Erik, I can confirm the issue is fixed.

- Johan

On Fri, Apr 26, 2024 at 3:32 PM <erik.joelsson at oracle.com> wrote:

> On 4/25/24 11:46, erik.joelsson at oracle.com wrote:
>
>
> On 4/25/24 10:05, Johan Vos wrote:
>
> Thanks for the investigation. That makes sense indeed, I didn't spot the
> openjdk-bot versus openjdk-bots difference.
> I see that the previous PR (22) has been closed, and a new PR (23) is
> created, but that is still created from
> https://github.com/openjdk-bot/mobile/tree/3
> <https://urldefense.com/v3/__https://github.com/openjdk-bot/mobile/tree/3__;!!ACWV5N9M2RV99hQ!ILbuREdYo9Ruus9faf7UNhkM9iwSvcN0mL_jZJo8WT-ZFEtIFsx7m6oM-qUN5er3xlxhSrYYufzm2nEiUUaW80Y$>
> (without s) .
> 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).
>
> 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 SKARA-2242
> <https://bugs.openjdk.org/browse/SKARA-2242>.
>
> 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.
>
> /Erik
>
> /Erik
>
> Thanks a lot!
>
> - Johan
>
> On Thu, Apr 25, 2024 at 2:40 PM <erik.joelsson at oracle.com> wrote:
>
>> On 4/25/24 05:34, erik.joelsson at oracle.com wrote:
>> > Hello Johan,
>> >
>> > (I finally had some time to look at this today)
>> >
>> > I recently changed the fork repository that the bot should be creating
>> > these PRs from. It used to be "openjdk-bot/<repo>" but it's now
>> > "openjdk-bots/<repo>", note the "s". In this PR the actual source repo
>> > is the old "openjdk-bot" but the body text has "openjdk-bots" in the
>> > instructions. The branch name is calculated based on the number of
>> > branches present in the fork, so the number 2 indicates that it was
>> > based on the new "openjdk-bots" repo, but still the PR has
>> > "openjdk-bot/mobile" as the source. I'm puzzled and don't know how
>> > this could have happened.
>> >
>> I believe this was caused by me changing the bot configuration, but this
>> bot had cached local repositories in its private scratch work area, and
>> those cached repositories had remotes still pointing to the old fork. I
>> have deleted all cached data, and restarted the bot, but this PR is
>> still broken and need to be closed.
>>
>> /Erik
>>
>> > /Erik
>> >
>> > On 4/25/24 00:25, Johan Vos wrote:
>> >> Until recently, all PR's from the openjdk-bots that were created to
>> >> allow solving conflicts when merging commits from openjdk/jdk:HEAD
>> >> into openjdk/mobile:HEAD went fine.
>> >> The last PR that was created though [1], seems to be weird and I
>> >> wonder if there is something wrong with the PR generation.
>> >>
>> >> From the github website, it seems there are 25 files with a conflict,
>> >> although that does not seem to be true when I compared them manually.
>> >> The usual process of fixing the merge conflicts and pushing them to
>> >> the openjdk-bots/mobile:+2 branch did not trigger the next steps in
>> >> the PR on openjdk/mobile.
>> >>
>> >> What surprises me is that the latest branch in the
>> >> openjdk-bots/mobile repository has the name "2". In the past, those
>> >> branches had incremental names, and the previous branch was named
>> >> "14". I expected to see a branch named "15" but the PR was raised
>> >> from a branch named "2" which is 27772 commits behind the master of
>> >> openjdk/mobile.
>> >>
>> >> - Johan
>> >>
>> >> [1] https://github.com/openjdk/mobile/pull/22
>> <https://urldefense.com/v3/__https://github.com/openjdk/mobile/pull/22__;!!ACWV5N9M2RV99hQ!ILbuREdYo9Ruus9faf7UNhkM9iwSvcN0mL_jZJo8WT-ZFEtIFsx7m6oM-qUN5er3xlxhSrYYufzm2nEijHcQUxg$>
>> >> [2] https://github.com/openjdk-bot/mobile/tree/14
>> <https://urldefense.com/v3/__https://github.com/openjdk-bot/mobile/tree/14__;!!ACWV5N9M2RV99hQ!ILbuREdYo9Ruus9faf7UNhkM9iwSvcN0mL_jZJo8WT-ZFEtIFsx7m6oM-qUN5er3xlxhSrYYufzm2nEiRRlzSio$>
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mail.openjdk.org/pipermail/skara-dev/attachments/20240427/1a03b8ce/attachment.htm>