From zsong at openjdk.org Fri Mar 1 23:34:08 2024 From: zsong at openjdk.org (Zhao Song) Date: Fri, 1 Mar 2024 23:34:08 GMT Subject: RFR: 2189: Mark command as handled when JCheckConfiguration is missing or invalid in PullRequestCommandWorkItem Message-ID: Recently, we found that the skara bot keeps trying to process /open command in this pr https://github.com/openjdk/jdk8u-dev/pull/393 After investigation, we found that this pr is a dependent pr and this pr was closed before the parent pr(https://github.com/openjdk/jdk8u-dev/pull/392) got integrated, so this dependent pr didn't get retargeted. Skara bot was trying to process the command but the bot couldn't find jcheck configuration in the target branch because the target is already deleted. And when the jcheck configuration is invalid or missing in PullRequestCommandWorkItem, RuntimeException would be thrown, causing the bot to repeatedly process the command. This behavior is wrong because when jcheck configuration is missing or invalid, it wouldn't recover automatically. In this case, the bot should just notice the user what problem it found and mark the command as handled to prevent the bot from being stuck in a loop. ------------- Commit messages: - SKARA-2189 Changes: https://git.openjdk.org/skara/pull/1616/files Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1616&range=00 Issue: https://bugs.openjdk.org/browse/SKARA-2189 Stats: 60 lines in 2 files changed: 56 ins; 1 del; 3 mod Patch: https://git.openjdk.org/skara/pull/1616.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1616/head:pull/1616 PR: https://git.openjdk.org/skara/pull/1616 From erikj at openjdk.org Mon Mar 4 15:15:22 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Mon, 4 Mar 2024 15:15:22 GMT Subject: RFR: 2189: Mark command as handled when JCheckConfiguration is missing or invalid in PullRequestCommandWorkItem In-Reply-To: References: Message-ID: <3Mzr3kfx4HwmJbpUpOTQ6XrhNz8xik9i0_mmc1Sdr1w=.b5a48d1b-1dcc-4254-82e2-e788f5040b86@github.com> On Fri, 1 Mar 2024 23:11:57 GMT, Zhao Song wrote: > Recently, we found that the skara bot keeps trying to process /open command in this pr https://github.com/openjdk/jdk8u-dev/pull/393 > > After investigation, we found that this pr is a dependent pr and this pr was closed before the parent pr(https://github.com/openjdk/jdk8u-dev/pull/392) got integrated, so this dependent pr didn't get retargeted. > > Skara bot was trying to process the command but the bot couldn't find jcheck configuration in the target branch because the target is already deleted. And when the jcheck configuration is invalid or missing in PullRequestCommandWorkItem, RuntimeException would be thrown, causing the bot to repeatedly process the command. This behavior is wrong because when jcheck configuration is missing or invalid, it wouldn't recover automatically. In this case, the bot should just notice the user what problem it found and mark the command as handled to prevent the bot from being stuck in a loop. bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestCommandWorkItem.java line 219: > 217: var branchNames = pr.repository().branches().stream().map(HostedBranch::name).toList(); > 218: if (branchNames.contains(pr.targetRef())) { > 219: printer.println("JCheck configuration is missing or invalid in the target branch of this pull request."); We do know if it's missing or invalid based on the type of the exception. I think it's worth differentiating the message based on this. bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestCommandWorkItem.java line 227: > 225: " is missing or invalid in repo " + bot.confOverrideRepository().get().name()); > 226: printer.println("The JCheck configuration has been overridden, " + > 227: "but it's missing or invalid. Skara admin has been noticed and will fix it as soon as possible."); Suggestion: "but is missing or invalid. Skara admins have been notified."); bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestCommandWorkItem.java line 229: > 227: "but it's missing or invalid. Skara admin has been noticed and will fix it as soon as possible."); > 228: } > 229: printer.print("Please issue this command again once the problem has been resolved."); I don't think this should be printed on a separate line. ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1616#discussion_r1511325162 PR Review Comment: https://git.openjdk.org/skara/pull/1616#discussion_r1511322543 PR Review Comment: https://git.openjdk.org/skara/pull/1616#discussion_r1511326549 From zsong at openjdk.org Mon Mar 4 18:01:56 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 4 Mar 2024 18:01:56 GMT Subject: RFR: 2189: Mark command as handled when JCheckConfiguration is missing or invalid in PullRequestCommandWorkItem [v2] In-Reply-To: References: Message-ID: > Recently, we found that the skara bot keeps trying to process /open command in this pr https://github.com/openjdk/jdk8u-dev/pull/393 > > After investigation, we found that this pr is a dependent pr and this pr was closed before the parent pr(https://github.com/openjdk/jdk8u-dev/pull/392) got integrated, so this dependent pr didn't get retargeted. > > Skara bot was trying to process the command but the bot couldn't find jcheck configuration in the target branch because the target is already deleted. And when the jcheck configuration is invalid or missing in PullRequestCommandWorkItem, RuntimeException would be thrown, causing the bot to repeatedly process the command. This behavior is wrong because when jcheck configuration is missing or invalid, it wouldn't recover automatically. In this case, the bot should just notice the user what problem it found and mark the command as handled to prevent the bot from being stuck in a loop. Zhao Song has updated the pull request incrementally with one additional commit since the last revision: Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestCommandWorkItem.java Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com> ------------- Changes: - all: https://git.openjdk.org/skara/pull/1616/files - new: https://git.openjdk.org/skara/pull/1616/files/7830cfea..6a09ed02 Webrevs: - full: https://webrevs.openjdk.org/?repo=skara&pr=1616&range=01 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1616&range=00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.org/skara/pull/1616.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1616/head:pull/1616 PR: https://git.openjdk.org/skara/pull/1616 From zsong at openjdk.org Mon Mar 4 18:01:57 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 4 Mar 2024 18:01:57 GMT Subject: RFR: 2189: Mark command as handled when JCheckConfiguration is missing or invalid in PullRequestCommandWorkItem [v2] In-Reply-To: <3Mzr3kfx4HwmJbpUpOTQ6XrhNz8xik9i0_mmc1Sdr1w=.b5a48d1b-1dcc-4254-82e2-e788f5040b86@github.com> References: <3Mzr3kfx4HwmJbpUpOTQ6XrhNz8xik9i0_mmc1Sdr1w=.b5a48d1b-1dcc-4254-82e2-e788f5040b86@github.com> Message-ID: <5zSON1vlbGszRzCvnkybisZnFfq0AofEVARXB9VxJZw=.cccc534f-0c87-4fa1-a0c5-aa366b6720f9@github.com> On Mon, 4 Mar 2024 15:12:42 GMT, Erik Joelsson wrote: >> Zhao Song has updated the pull request incrementally with one additional commit since the last revision: >> >> Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestCommandWorkItem.java >> >> Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com> > > bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestCommandWorkItem.java line 229: > >> 227: "but it's missing or invalid. Skara admin has been noticed and will fix it as soon as possible."); >> 228: } >> 229: printer.print("Please issue this command again once the problem has been resolved."); > > I don't think this should be printed on a separate line. Sure, will fix it. ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1616#discussion_r1511557969 From zsong at openjdk.org Mon Mar 4 18:21:44 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 4 Mar 2024 18:21:44 GMT Subject: RFR: 2189: Mark command as handled when JCheckConfiguration is missing or invalid in PullRequestCommandWorkItem [v3] In-Reply-To: References: Message-ID: > Recently, we found that the skara bot keeps trying to process /open command in this pr https://github.com/openjdk/jdk8u-dev/pull/393 > > After investigation, we found that this pr is a dependent pr and this pr was closed before the parent pr(https://github.com/openjdk/jdk8u-dev/pull/392) got integrated, so this dependent pr didn't get retargeted. > > Skara bot was trying to process the command but the bot couldn't find jcheck configuration in the target branch because the target is already deleted. And when the jcheck configuration is invalid or missing in PullRequestCommandWorkItem, RuntimeException would be thrown, causing the bot to repeatedly process the command. This behavior is wrong because when jcheck configuration is missing or invalid, it wouldn't recover automatically. In this case, the bot should just notice the user what problem it found and mark the command as handled to prevent the bot from being stuck in a loop. Zhao Song has updated the pull request incrementally with one additional commit since the last revision: fix issues ------------- Changes: - all: https://git.openjdk.org/skara/pull/1616/files - new: https://git.openjdk.org/skara/pull/1616/files/6a09ed02..e1baec45 Webrevs: - full: https://webrevs.openjdk.org/?repo=skara&pr=1616&range=02 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1616&range=01-02 Stats: 17 lines in 2 files changed: 8 ins; 0 del; 9 mod Patch: https://git.openjdk.org/skara/pull/1616.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1616/head:pull/1616 PR: https://git.openjdk.org/skara/pull/1616 From erikj at openjdk.org Mon Mar 4 18:51:33 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Mon, 4 Mar 2024 18:51:33 GMT Subject: RFR: 2189: Mark command as handled when JCheckConfiguration is missing or invalid in PullRequestCommandWorkItem [v3] In-Reply-To: References: Message-ID: On Mon, 4 Mar 2024 18:21:44 GMT, Zhao Song wrote: >> Recently, we found that the skara bot keeps trying to process /open command in this pr https://github.com/openjdk/jdk8u-dev/pull/393 >> >> After investigation, we found that this pr is a dependent pr and this pr was closed before the parent pr(https://github.com/openjdk/jdk8u-dev/pull/392) got integrated, so this dependent pr didn't get retargeted. >> >> Skara bot was trying to process the command but the bot couldn't find jcheck configuration in the target branch because the target is already deleted. And when the jcheck configuration is invalid or missing in PullRequestCommandWorkItem, RuntimeException would be thrown, causing the bot to repeatedly process the command. This behavior is wrong because when jcheck configuration is missing or invalid, it wouldn't recover automatically. In this case, the bot should just notice the user what problem it found and mark the command as handled to prevent the bot from being stuck in a loop. > > Zhao Song has updated the pull request incrementally with one additional commit since the last revision: > > fix issues Marked as reviewed by erikj (Lead). ------------- PR Review: https://git.openjdk.org/skara/pull/1616#pullrequestreview-1915048661 From zsong at openjdk.org Mon Mar 4 19:38:43 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 4 Mar 2024 19:38:43 GMT Subject: RFR: 2189: Mark command as handled when JCheckConfiguration is missing or invalid in PullRequestCommandWorkItem [v3] In-Reply-To: References: Message-ID: On Mon, 4 Mar 2024 18:21:44 GMT, Zhao Song wrote: >> Recently, we found that the skara bot keeps trying to process /open command in this pr https://github.com/openjdk/jdk8u-dev/pull/393 >> >> After investigation, we found that this pr is a dependent pr and this pr was closed before the parent pr(https://github.com/openjdk/jdk8u-dev/pull/392) got integrated, so this dependent pr didn't get retargeted. >> >> Skara bot was trying to process the command but the bot couldn't find jcheck configuration in the target branch because the target is already deleted. And when the jcheck configuration is invalid or missing in PullRequestCommandWorkItem, RuntimeException would be thrown, causing the bot to repeatedly process the command. This behavior is wrong because when jcheck configuration is missing or invalid, it wouldn't recover automatically. In this case, the bot should just notice the user what problem it found and mark the command as handled to prevent the bot from being stuck in a loop. > > Zhao Song has updated the pull request incrementally with one additional commit since the last revision: > > fix issues Thanks for the review! ------------- PR Comment: https://git.openjdk.org/skara/pull/1616#issuecomment-1977321076 From zsong at openjdk.org Mon Mar 4 19:38:44 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 4 Mar 2024 19:38:44 GMT Subject: Integrated: 2189: Mark command as handled when JCheckConfiguration is missing or invalid in PullRequestCommandWorkItem In-Reply-To: References: Message-ID: On Fri, 1 Mar 2024 23:11:57 GMT, Zhao Song wrote: > Recently, we found that the skara bot keeps trying to process /open command in this pr https://github.com/openjdk/jdk8u-dev/pull/393 > > After investigation, we found that this pr is a dependent pr and this pr was closed before the parent pr(https://github.com/openjdk/jdk8u-dev/pull/392) got integrated, so this dependent pr didn't get retargeted. > > Skara bot was trying to process the command but the bot couldn't find jcheck configuration in the target branch because the target is already deleted. And when the jcheck configuration is invalid or missing in PullRequestCommandWorkItem, RuntimeException would be thrown, causing the bot to repeatedly process the command. This behavior is wrong because when jcheck configuration is missing or invalid, it wouldn't recover automatically. In this case, the bot should just notice the user what problem it found and mark the command as handled to prevent the bot from being stuck in a loop. This pull request has now been integrated. Changeset: 7b937ab9 Author: Zhao Song URL: https://git.openjdk.org/skara/commit/7b937ab96469ff0f9c8dcaa4c56f533b07028ba0 Stats: 68 lines in 2 files changed: 64 ins; 1 del; 3 mod 2189: Mark command as handled when JCheckConfiguration is missing or invalid in PullRequestCommandWorkItem Reviewed-by: erikj ------------- PR: https://git.openjdk.org/skara/pull/1616 From lujaniuk at openjdk.org Tue Mar 5 13:30:34 2024 From: lujaniuk at openjdk.org (Ludvig Janiuk) Date: Tue, 5 Mar 2024 13:30:34 GMT Subject: RFR: 2191 Handle multiple available skara.gitconfig files Message-ID: This adds "tail -1" to the bootstrap mechanism, to handle the case if we find more than one skara.gitconfig file. The alternative is to execute a malformed shell invocation. ------------- Commit messages: - 2191 Handle multiple available skara.gitconfig files Changes: https://git.openjdk.org/skara/pull/1618/files Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1618&range=00 Issue: https://bugs.openjdk.org/browse/SKARA-2191 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.org/skara/pull/1618.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1618/head:pull/1618 PR: https://git.openjdk.org/skara/pull/1618 From erikj at openjdk.org Tue Mar 5 13:48:46 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Tue, 5 Mar 2024 13:48:46 GMT Subject: RFR: 2191 Handle multiple available skara.gitconfig files In-Reply-To: References: Message-ID: On Tue, 5 Mar 2024 13:26:59 GMT, Ludvig Janiuk wrote: > This adds "tail -1" to the bootstrap mechanism, to handle the case if we find more than one skara.gitconfig file. The alternative is to execute a malformed shell invocation. Marked as reviewed by erikj (Lead). ------------- PR Review: https://git.openjdk.org/skara/pull/1618#pullrequestreview-1916995450 From zsong at openjdk.org Thu Mar 7 00:55:25 2024 From: zsong at openjdk.org (Zhao Song) Date: Thu, 7 Mar 2024 00:55:25 GMT Subject: RFR: 2190: Setting maximum size limit for PR diff in generating Webrev Message-ID: https://github.com/openjdk/tsan/pull/17, there are more than 5000 commits in this pr and mlbridge bot was trying to generate the webrev. The generation of webrev was successful but the webrev file was too big and exceeded GitHub's file size limit. So as ErikJ suggested, if the diff of the pr is too large, we shouldn't generate webrev for it. ------------- Commit messages: - add test - update - SKARA-2190 - update - update - update - SKARA-2190 Changes: https://git.openjdk.org/skara/pull/1617/files Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1617&range=00 Issue: https://bugs.openjdk.org/browse/SKARA-2190 Stats: 232 lines in 9 files changed: 173 ins; 0 del; 59 mod Patch: https://git.openjdk.org/skara/pull/1617.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1617/head:pull/1617 PR: https://git.openjdk.org/skara/pull/1617 From erikj at openjdk.org Thu Mar 7 18:30:16 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Thu, 7 Mar 2024 18:30:16 GMT Subject: RFR: 2190: Setting maximum size limit for PR diff in generating Webrev In-Reply-To: References: Message-ID: On Mon, 4 Mar 2024 23:12:56 GMT, Zhao Song wrote: > https://github.com/openjdk/tsan/pull/17, there are more than 5000 commits in this pr and mlbridge bot was trying to generate the webrev. The generation of webrev was successful but the webrev file was too big and exceeded GitHub's file size limit. > > So as ErikJ suggested, if the diff of the pr is too large, we shouldn't generate webrev for it. bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveMessages.java line 329: > 327: "Changes: " + pr.changeUrl() + "\n" + > 328: (webrev.diffTooLarge() ? > 329: " Webrev: Webrev is not available because diff is too large\n" : This string is repeated a lot, can we make it a constant, at least within this class? webrev/src/main/java/org/openjdk/skara/webrev/Webrev.java line 210: > 208: .mapToInt(Hunk::changes) > 209: .sum(); > 210: return totalChanges > 300000; Please make this a constant. ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1617#discussion_r1516624970 PR Review Comment: https://git.openjdk.org/skara/pull/1617#discussion_r1516630783 From zsong at openjdk.org Thu Mar 7 18:51:55 2024 From: zsong at openjdk.org (Zhao Song) Date: Thu, 7 Mar 2024 18:51:55 GMT Subject: RFR: 2190: Setting maximum size limit for PR diff in generating Webrev In-Reply-To: References: Message-ID: On Thu, 7 Mar 2024 18:22:39 GMT, Erik Joelsson wrote: >> https://github.com/openjdk/tsan/pull/17, there are more than 5000 commits in this pr and mlbridge bot was trying to generate the webrev. The generation of webrev was successful but the webrev file was too big and exceeded GitHub's file size limit. >> >> So as ErikJ suggested, if the diff of the pr is too large, we shouldn't generate webrev for it. > > bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveMessages.java line 329: > >> 327: "Changes: " + pr.changeUrl() + "\n" + >> 328: (webrev.diffTooLarge() ? >> 329: " Webrev: Webrev is not available because diff is too large\n" : > > This string is repeated a lot, can we make it a constant, at least within this class? Sure, will fix it > webrev/src/main/java/org/openjdk/skara/webrev/Webrev.java line 210: > >> 208: .mapToInt(Hunk::changes) >> 209: .sum(); >> 210: return totalChanges > 300000; > > Please make this a constant. Sure ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1617#discussion_r1516655418 PR Review Comment: https://git.openjdk.org/skara/pull/1617#discussion_r1516655523 From zsong at openjdk.org Thu Mar 7 19:14:04 2024 From: zsong at openjdk.org (Zhao Song) Date: Thu, 7 Mar 2024 19:14:04 GMT Subject: RFR: 2190: Setting maximum size limit for PR diff in generating Webrev [v2] In-Reply-To: References: Message-ID: > https://github.com/openjdk/tsan/pull/17, there are more than 5000 commits in this pr and mlbridge bot was trying to generate the webrev. The generation of webrev was successful but the webrev file was too big and exceeded GitHub's file size limit. > > So as ErikJ suggested, if the diff of the pr is too large, we shouldn't generate webrev for it. Zhao Song has updated the pull request incrementally with one additional commit since the last revision: review comment ------------- Changes: - all: https://git.openjdk.org/skara/pull/1617/files - new: https://git.openjdk.org/skara/pull/1617/files/2824b3f3..5e7b7111 Webrevs: - full: https://webrevs.openjdk.org/?repo=skara&pr=1617&range=01 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1617&range=00-01 Stats: 11 lines in 3 files changed: 3 ins; 0 del; 8 mod Patch: https://git.openjdk.org/skara/pull/1617.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1617/head:pull/1617 PR: https://git.openjdk.org/skara/pull/1617 From erikj at openjdk.org Fri Mar 8 14:05:46 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Fri, 8 Mar 2024 14:05:46 GMT Subject: RFR: 2190: Setting maximum size limit for PR diff in generating Webrev [v2] In-Reply-To: References: Message-ID: On Thu, 7 Mar 2024 19:14:04 GMT, Zhao Song wrote: >> https://github.com/openjdk/tsan/pull/17, there are more than 5000 commits in this pr and mlbridge bot was trying to generate the webrev. The generation of webrev was successful but the webrev file was too big and exceeded GitHub's file size limit. >> >> So as ErikJ suggested, if the diff of the pr is too large, we shouldn't generate webrev for it. > > Zhao Song has updated the pull request incrementally with one additional commit since the last revision: > > review comment Marked as reviewed by erikj (Lead). ------------- PR Review: https://git.openjdk.org/skara/pull/1617#pullrequestreview-1924947348 From zsong at openjdk.org Fri Mar 8 17:35:09 2024 From: zsong at openjdk.org (Zhao Song) Date: Fri, 8 Mar 2024 17:35:09 GMT Subject: RFR: 2190: Setting maximum size limit for PR diff in generating Webrev [v2] In-Reply-To: References: Message-ID: <--iCLIJS5dw8DL3stEmWg0FJY5oV_ZMXE3BSVsmf2I4=.7c00b355-a3ae-4409-83ed-c5e8802d1159@github.com> An HTML attachment was scrubbed... URL: From zsong at openjdk.org Fri Mar 8 17:35:10 2024 From: zsong at openjdk.org (Zhao Song) Date: Fri, 8 Mar 2024 17:35:10 GMT Subject: Integrated: 2190: Setting maximum size limit for PR diff in generating Webrev In-Reply-To: References: Message-ID: An HTML attachment was scrubbed... URL: From erik.joelsson at oracle.com Fri Mar 8 18:34:12 2024 From: erik.joelsson at oracle.com (erik.joelsson at oracle.com) Date: Fri, 8 Mar 2024 10:34:12 -0800 Subject: test from oracle Message-ID: <8c137359-ed16-4b79-8467-42bd591535c6@oracle.com> test message, please ignore From erikj at openjdk.org Fri Mar 8 18:37:46 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Fri, 8 Mar 2024 18:37:46 GMT Subject: RFR: 2190: Setting maximum size limit for PR diff in generating Webrev [v2] In-Reply-To: References: Message-ID: On Thu, 7 Mar 2024 19:14:04 GMT, Zhao Song wrote: >> https://github.com/openjdk/tsan/pull/17, there are more than 5000 commits in this pr and mlbridge bot was trying to generate the webrev. The generation of webrev was successful but the webrev file was too big and exceeded GitHub's file size limit. >> >> So as ErikJ suggested, if the diff of the pr is too large, we shouldn't generate webrev for it. > > Zhao Song has updated the pull request incrementally with one additional commit since the last revision: > > review comment Test comment, please ignore. ------------- PR Comment: https://git.openjdk.org/skara/pull/1617#issuecomment-1986210804 From zsong at openjdk.org Fri Mar 8 23:52:01 2024 From: zsong at openjdk.org (Zhao Song) Date: Fri, 8 Mar 2024 23:52:01 GMT Subject: RFR: 2070: Get a placeholder message spot for integration message Message-ID: As Magnus said in the issue description, sometimes it's hard for users to find the merge ready comment. So he would like to see that this message is added as soon as possible, after the bridgekeeper has done its job. In this patch, on the very beginning of CheckWorkItem, skara bot would post a placeholder message to the PR and update it later. ------------- Commit messages: - SKARA-2070 Changes: https://git.openjdk.org/skara/pull/1619/files Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1619&range=00 Issue: https://bugs.openjdk.org/browse/SKARA-2070 Stats: 174 lines in 13 files changed: 43 ins; 14 del; 117 mod Patch: https://git.openjdk.org/skara/pull/1619.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1619/head:pull/1619 PR: https://git.openjdk.org/skara/pull/1619 From dev at anthonyv.be Sat Mar 9 08:21:08 2024 From: dev at anthonyv.be (Anthony Vanelverdinghe) Date: Sat, 9 Mar 2024 09:21:08 +0100 Subject: GitHub comment to mailing list message conversion Message-ID: <6341a453-0482-4ed6-b7cf-77a829ad29a5@anthonyv.be> This GitHub comment: https://github.com/openjdk/jdk/pull/16226#issuecomment-1986116361 resulted in this mailing list message: https://mail.openjdk.org/pipermail/nio-dev/2024-March/015981.html I'd expect conversion to always result in a readable message at https://mail.openjdk.org so this seems like a bug to me? On another note, what's the best way to build on a previous GitHub comment of my own? Should I edit the GitHub comment, and that will result in a new mailing list message? Or should I write a new GitHub comment and quote any relevant text from the previous comment? Kind regards, Anthony From ihse at openjdk.org Mon Mar 11 12:55:26 2024 From: ihse at openjdk.org (Magnus Ihse Bursie) Date: Mon, 11 Mar 2024 12:55:26 GMT Subject: RFR: 2070: Get a placeholder message spot for integration message In-Reply-To: References: Message-ID: <1s95qkWTUGR_hsr51GBi2KWG1fso4FZaTlq_VJIiZ7Y=.b82200d6-6dd8-4f9f-9fd5-e7790ee741ec@github.com> On Fri, 8 Mar 2024 23:48:04 GMT, Zhao Song wrote: > As Magnus said in the issue description, sometimes it's hard for users to find the merge ready comment. So he would like to see that this message is added as soon as possible, after the bridgekeeper has done its job. > > In this patch, on the very beginning of CheckWorkItem, skara bot would post a placeholder message to the PR and update it later. Nice! Thanks for fixing this. Do you have an test PR that demonstrates how this looks? ------------- PR Comment: https://git.openjdk.org/skara/pull/1619#issuecomment-1988374215 From lujaniuk at openjdk.org Mon Mar 11 13:31:44 2024 From: lujaniuk at openjdk.org (Ludvig Janiuk) Date: Mon, 11 Mar 2024 13:31:44 GMT Subject: Integrated: 2191 Handle multiple available skara.gitconfig files In-Reply-To: References: Message-ID: <11v9aKbtErpnVYDWvmOA_anT4wh1UiRDO9Q3m5KjhyY=.73382fd8-0d16-46f0-91b0-586dc8baf019@github.com> On Tue, 5 Mar 2024 13:26:59 GMT, Ludvig Janiuk wrote: > This adds "tail -1" to the bootstrap mechanism, to handle the case if we find more than one skara.gitconfig file. The alternative is to execute a malformed shell invocation. This pull request has now been integrated. Changeset: 5b84d05e Author: Ludvig Janiuk Committer: Erik Joelsson URL: https://git.openjdk.org/skara/commit/5b84d05ee246b63dced10f5e86456f95115cc152 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod 2191: Handle multiple available skara.gitconfig files Reviewed-by: erikj ------------- PR: https://git.openjdk.org/skara/pull/1618 From erikj at openjdk.org Mon Mar 11 18:35:02 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Mon, 11 Mar 2024 18:35:02 GMT Subject: RFR: 2070: Get a placeholder message spot for integration message In-Reply-To: References: Message-ID: On Fri, 8 Mar 2024 23:48:04 GMT, Zhao Song wrote: > As Magnus said in the issue description, sometimes it's hard for users to find the merge ready comment. So he would like to see that this message is added as soon as possible, after the bridgekeeper has done its job. > > In this patch, on the very beginning of CheckWorkItem, skara bot would post a placeholder message to the PR and update it later. bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckWorkItem.java line 728: > 726: } > 727: > 728: private List postPlaceholderMessageForReadyComment(List comments) { I think this method name would be both shorter and clearer: Suggestion: private List postPlaceholderForReadyComment(List comments) { bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckWorkItem.java line 738: > 736: String message = "? This change is not yet ready to be integrated.\n" + > 737: "See the **Progress** checklist in the description for automated requirements.\n" + > 738: "This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.\n" + This message in `getMergeReadyComment` is only printed if the file exists in the repo. It's not included in `getMergeNoLongerReadyComment`. Not sure if it's worth including here. I think we should probably just emulate the no longer ready comment as closely as possible. ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1619#discussion_r1520235766 PR Review Comment: https://git.openjdk.org/skara/pull/1619#discussion_r1520251237 From zsong at openjdk.org Mon Mar 11 20:10:15 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 11 Mar 2024 20:10:15 GMT Subject: RFR: 2070: Get a placeholder message spot for integration message [v2] In-Reply-To: References: Message-ID: > As Magnus said in the issue description, sometimes it's hard for users to find the merge ready comment. So he would like to see that this message is added as soon as possible, after the bridgekeeper has done its job. > > In this patch, on the very beginning of CheckWorkItem, skara bot would post a placeholder message to the PR and update it later. Zhao Song has updated the pull request incrementally with one additional commit since the last revision: Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckWorkItem.java Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com> ------------- Changes: - all: https://git.openjdk.org/skara/pull/1619/files - new: https://git.openjdk.org/skara/pull/1619/files/b1de304b..9648a9d4 Webrevs: - full: https://webrevs.openjdk.org/?repo=skara&pr=1619&range=01 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1619&range=00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.org/skara/pull/1619.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1619/head:pull/1619 PR: https://git.openjdk.org/skara/pull/1619 From zsong at openjdk.org Mon Mar 11 20:13:32 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 11 Mar 2024 20:13:32 GMT Subject: RFR: 2070: Get a placeholder message spot for integration message [v2] In-Reply-To: References: Message-ID: <7ftmjdpV20eqkXX_G9os9jBiy1AXzQ9uzrPphPIiDIE=.aeeed1fb-e6af-4cb3-b2b9-1f7ac4574d20@github.com> On Mon, 11 Mar 2024 18:30:15 GMT, Erik Joelsson wrote: >> Zhao Song has updated the pull request incrementally with one additional commit since the last revision: >> >> Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckWorkItem.java >> >> Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com> > > bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckWorkItem.java line 738: > >> 736: String message = "? This change is not yet ready to be integrated.\n" + >> 737: "See the **Progress** checklist in the description for automated requirements.\n" + >> 738: "This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.\n" + > > This message in `getMergeReadyComment` is only printed if the file exists in the repo. It's not included in `getMergeNoLongerReadyComment`. Not sure if it's worth including here. I think we should probably just emulate the no longer ready comment as closely as possible. Yes, we shouldn't include that message. I will fix it. Thanks! ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1619#discussion_r1520371728 From zsong at openjdk.org Mon Mar 11 20:25:46 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 11 Mar 2024 20:25:46 GMT Subject: RFR: 2070: Get a placeholder message spot for integration message [v3] In-Reply-To: References: Message-ID: <7aptKMKxQ1wZi1KYmXzIHb5GH9Xri0gx0GxVHmMOxJA=.c100c082-8ded-4267-aea0-d2b872d3b072@github.com> > As Magnus said in the issue description, sometimes it's hard for users to find the merge ready comment. So he would like to see that this message is added as soon as possible, after the bridgekeeper has done its job. > > In this patch, on the very beginning of CheckWorkItem, skara bot would post a placeholder message to the PR and update it later. Zhao Song has updated the pull request incrementally with one additional commit since the last revision: update ------------- Changes: - all: https://git.openjdk.org/skara/pull/1619/files - new: https://git.openjdk.org/skara/pull/1619/files/9648a9d4..f9fcfe2b Webrevs: - full: https://webrevs.openjdk.org/?repo=skara&pr=1619&range=02 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1619&range=01-02 Stats: 3 lines in 1 file changed: 1 ins; 1 del; 1 mod Patch: https://git.openjdk.org/skara/pull/1619.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1619/head:pull/1619 PR: https://git.openjdk.org/skara/pull/1619 From zsong at openjdk.org Mon Mar 11 20:30:33 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 11 Mar 2024 20:30:33 GMT Subject: RFR: 2070: Get a placeholder message spot for integration message In-Reply-To: <1s95qkWTUGR_hsr51GBi2KWG1fso4FZaTlq_VJIiZ7Y=.b82200d6-6dd8-4f9f-9fd5-e7790ee741ec@github.com> References: <1s95qkWTUGR_hsr51GBi2KWG1fso4FZaTlq_VJIiZ7Y=.b82200d6-6dd8-4f9f-9fd5-e7790ee741ec@github.com> Message-ID: On Mon, 11 Mar 2024 12:53:21 GMT, Magnus Ihse Bursie wrote: > Nice! Thanks for fixing this. Do you have an test PR that demonstrates how this looks? No, I haven't got a test PR. I will have one on playground after this PR is integrated. ------------- PR Comment: https://git.openjdk.org/skara/pull/1619#issuecomment-1989384512 From erikj at openjdk.org Mon Mar 11 23:08:43 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Mon, 11 Mar 2024 23:08:43 GMT Subject: RFR: 2070: Get a placeholder message spot for integration message [v3] In-Reply-To: <7aptKMKxQ1wZi1KYmXzIHb5GH9Xri0gx0GxVHmMOxJA=.c100c082-8ded-4267-aea0-d2b872d3b072@github.com> References: <7aptKMKxQ1wZi1KYmXzIHb5GH9Xri0gx0GxVHmMOxJA=.c100c082-8ded-4267-aea0-d2b872d3b072@github.com> Message-ID: On Mon, 11 Mar 2024 20:25:46 GMT, Zhao Song wrote: >> As Magnus said in the issue description, sometimes it's hard for users to find the merge ready comment. So he would like to see that this message is added as soon as possible, after the bridgekeeper has done its job. >> >> In this patch, on the very beginning of CheckWorkItem, skara bot would post a placeholder message to the PR and update it later. > > Zhao Song has updated the pull request incrementally with one additional commit since the last revision: > > update Marked as reviewed by erikj (Lead). ------------- PR Review: https://git.openjdk.org/skara/pull/1619#pullrequestreview-1929749167 From zsong at openjdk.org Tue Mar 12 16:28:14 2024 From: zsong at openjdk.org (Zhao Song) Date: Tue, 12 Mar 2024 16:28:14 GMT Subject: RFR: 2070: Get a placeholder message spot for integration message [v3] In-Reply-To: <7aptKMKxQ1wZi1KYmXzIHb5GH9Xri0gx0GxVHmMOxJA=.c100c082-8ded-4267-aea0-d2b872d3b072@github.com> References: <7aptKMKxQ1wZi1KYmXzIHb5GH9Xri0gx0GxVHmMOxJA=.c100c082-8ded-4267-aea0-d2b872d3b072@github.com> Message-ID: On Mon, 11 Mar 2024 20:25:46 GMT, Zhao Song wrote: >> As Magnus said in the issue description, sometimes it's hard for users to find the merge ready comment. So he would like to see that this message is added as soon as possible, after the bridgekeeper has done its job. >> >> In this patch, on the very beginning of CheckWorkItem, skara bot would post a placeholder message to the PR and update it later. > > Zhao Song has updated the pull request incrementally with one additional commit since the last revision: > > update Thanks for the review! ------------- PR Comment: https://git.openjdk.org/skara/pull/1619#issuecomment-1992067437 From zsong at openjdk.org Tue Mar 12 16:28:15 2024 From: zsong at openjdk.org (Zhao Song) Date: Tue, 12 Mar 2024 16:28:15 GMT Subject: Integrated: 2070: Get a placeholder message spot for integration message In-Reply-To: References: Message-ID: On Fri, 8 Mar 2024 23:48:04 GMT, Zhao Song wrote: > As Magnus said in the issue description, sometimes it's hard for users to find the merge ready comment. So he would like to see that this message is added as soon as possible, after the bridgekeeper has done its job. > > In this patch, on the very beginning of CheckWorkItem, skara bot would post a placeholder message to the PR and update it later. This pull request has now been integrated. Changeset: 40193134 Author: Zhao Song URL: https://git.openjdk.org/skara/commit/40193134ee6b2d3686d3069efc07027a847d7e64 Stats: 174 lines in 13 files changed: 43 ins; 14 del; 117 mod 2070: Get a placeholder message spot for integration message Reviewed-by: erikj ------------- PR: https://git.openjdk.org/skara/pull/1619 From zsong at openjdk.org Tue Mar 12 17:49:21 2024 From: zsong at openjdk.org (Zhao Song) Date: Tue, 12 Mar 2024 17:49:21 GMT Subject: RFR: 2070: Get a placeholder message spot for integration message In-Reply-To: References: <1s95qkWTUGR_hsr51GBi2KWG1fso4FZaTlq_VJIiZ7Y=.b82200d6-6dd8-4f9f-9fd5-e7790ee741ec@github.com> Message-ID: On Mon, 11 Mar 2024 20:28:26 GMT, Zhao Song wrote: > Nice! Thanks for fixing this. Do you have an test PR that demonstrates how this looks? Here is the test PR. You can see the edit history of this comment. https://github.com/openjdk/playground/pull/185#issuecomment-1992192423 ------------- PR Comment: https://git.openjdk.org/skara/pull/1619#issuecomment-1992227988 From zsong at openjdk.org Fri Mar 15 19:00:17 2024 From: zsong at openjdk.org (Zhao Song) Date: Fri, 15 Mar 2024 19:00:17 GMT Subject: RFR: 2197: Make the /backport command support a "repo:branch" argument Message-ID: This patch is trying to make /backport command support `repo:branch` argument. And as ErikD suggested, `repo` should be optional if the user is backporting to a different branch in the same repository. > To make it slightly more convenient to backport a commit to a branch in the same repository as the commit is residing in we would allow short form "/backport :branch" (this is also fully backwards compatible and cannot become ambiguous in the future). ------------- Commit messages: - SKARA-2197 Changes: https://git.openjdk.org/skara/pull/1620/files Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1620&range=00 Issue: https://bugs.openjdk.org/browse/SKARA-2197 Stats: 63 lines in 3 files changed: 56 ins; 0 del; 7 mod Patch: https://git.openjdk.org/skara/pull/1620.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1620/head:pull/1620 PR: https://git.openjdk.org/skara/pull/1620 From erikj at openjdk.org Fri Mar 15 19:35:39 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Fri, 15 Mar 2024 19:35:39 GMT Subject: RFR: 2197: Make the /backport command support a "repo:branch" argument In-Reply-To: References: Message-ID: On Fri, 15 Mar 2024 18:47:16 GMT, Zhao Song wrote: > This patch is trying to make /backport command support `repo:branch` argument. > > And as ErikD suggested, `repo` should be optional if the user is backporting to a different branch in the same repository. > >> To make it slightly more convenient to backport a commit to a branch in the same repository as the commit is residing in we would allow short form "/backport :branch" (this is also fully backwards compatible and cannot become ambiguous in the future). Marked as reviewed by erikj (Lead). ------------- PR Review: https://git.openjdk.org/skara/pull/1620#pullrequestreview-1940278861 From jlahoda at openjdk.org Mon Mar 18 15:59:32 2024 From: jlahoda at openjdk.org (Jan Lahoda) Date: Mon, 18 Mar 2024 15:59:32 GMT Subject: RFR: 2200: The jdk/internal/javac package should be mapped to the compiler label Message-ID: <4k81fRSI1FEJ81bD9zDIdEAvdDCI844yRzQomQISLuc=.dd308d5a-9cba-4c66-bfc8-243849261ec8@github.com> Originally, `jdk/internal/PreviewFeature.java` was mapped to the compiler label, but this has been moved into `jdk/internal/javac`, breaking the mapping. Re-mapping `jdk/internal/javac` back to compiler. Keeping the mapping to core-libs, partially because changes there may be relevant to core-libs as well. ------------- Commit messages: - 2200: The jdk/internal/javac package should be mapped to the compiler label Changes: https://git.openjdk.org/skara/pull/1621/files Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1621&range=00 Issue: https://bugs.openjdk.org/browse/SKARA-2200 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.org/skara/pull/1621.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1621/head:pull/1621 PR: https://git.openjdk.org/skara/pull/1621 From jjg at openjdk.org Mon Mar 18 15:59:32 2024 From: jjg at openjdk.org (Jonathan Gibbons) Date: Mon, 18 Mar 2024 15:59:32 GMT Subject: RFR: 2200: The jdk/internal/javac package should be mapped to the compiler label In-Reply-To: <4k81fRSI1FEJ81bD9zDIdEAvdDCI844yRzQomQISLuc=.dd308d5a-9cba-4c66-bfc8-243849261ec8@github.com> References: <4k81fRSI1FEJ81bD9zDIdEAvdDCI844yRzQomQISLuc=.dd308d5a-9cba-4c66-bfc8-243849261ec8@github.com> Message-ID: On Mon, 18 Mar 2024 15:53:22 GMT, Jan Lahoda wrote: > Originally, `jdk/internal/PreviewFeature.java` was mapped to the compiler label, but this has been moved into `jdk/internal/javac`, breaking the mapping. Re-mapping `jdk/internal/javac` back to compiler. Keeping the mapping to core-libs, partially because changes there may be relevant to core-libs as well. Marked as reviewed by jjg (no project role). ------------- PR Review: https://git.openjdk.org/skara/pull/1621#pullrequestreview-1943520812 From ihse at openjdk.org Mon Mar 18 15:59:32 2024 From: ihse at openjdk.org (Magnus Ihse Bursie) Date: Mon, 18 Mar 2024 15:59:32 GMT Subject: RFR: 2200: The jdk/internal/javac package should be mapped to the compiler label In-Reply-To: <4k81fRSI1FEJ81bD9zDIdEAvdDCI844yRzQomQISLuc=.dd308d5a-9cba-4c66-bfc8-243849261ec8@github.com> References: <4k81fRSI1FEJ81bD9zDIdEAvdDCI844yRzQomQISLuc=.dd308d5a-9cba-4c66-bfc8-243849261ec8@github.com> Message-ID: On Mon, 18 Mar 2024 15:53:22 GMT, Jan Lahoda wrote: > Originally, `jdk/internal/PreviewFeature.java` was mapped to the compiler label, but this has been moved into `jdk/internal/javac`, breaking the mapping. Re-mapping `jdk/internal/javac` back to compiler. Keeping the mapping to core-libs, partially because changes there may be relevant to core-libs as well. Marked as reviewed by ihse (Reviewer). ------------- PR Review: https://git.openjdk.org/skara/pull/1621#pullrequestreview-1943522772 From vromero at openjdk.org Mon Mar 18 16:26:42 2024 From: vromero at openjdk.org (Vicente Romero) Date: Mon, 18 Mar 2024 16:26:42 GMT Subject: RFR: 2200: The jdk/internal/javac package should be mapped to the compiler label In-Reply-To: <4k81fRSI1FEJ81bD9zDIdEAvdDCI844yRzQomQISLuc=.dd308d5a-9cba-4c66-bfc8-243849261ec8@github.com> References: <4k81fRSI1FEJ81bD9zDIdEAvdDCI844yRzQomQISLuc=.dd308d5a-9cba-4c66-bfc8-243849261ec8@github.com> Message-ID: On Mon, 18 Mar 2024 15:53:22 GMT, Jan Lahoda wrote: > Originally, `jdk/internal/PreviewFeature.java` was mapped to the compiler label, but this has been moved into `jdk/internal/javac`, breaking the mapping. Re-mapping `jdk/internal/javac` back to compiler. Keeping the mapping to core-libs, partially because changes there may be relevant to core-libs as well. looks good ------------- Marked as reviewed by vromero (no project role). PR Review: https://git.openjdk.org/skara/pull/1621#pullrequestreview-1943591596 From jlahoda at openjdk.org Mon Mar 18 16:44:45 2024 From: jlahoda at openjdk.org (Jan Lahoda) Date: Mon, 18 Mar 2024 16:44:45 GMT Subject: Integrated: 2200: The jdk/internal/javac package should be mapped to the compiler label In-Reply-To: <4k81fRSI1FEJ81bD9zDIdEAvdDCI844yRzQomQISLuc=.dd308d5a-9cba-4c66-bfc8-243849261ec8@github.com> References: <4k81fRSI1FEJ81bD9zDIdEAvdDCI844yRzQomQISLuc=.dd308d5a-9cba-4c66-bfc8-243849261ec8@github.com> Message-ID: On Mon, 18 Mar 2024 15:53:22 GMT, Jan Lahoda wrote: > Originally, `jdk/internal/PreviewFeature.java` was mapped to the compiler label, but this has been moved into `jdk/internal/javac`, breaking the mapping. Re-mapping `jdk/internal/javac` back to compiler. Keeping the mapping to core-libs, partially because changes there may be relevant to core-libs as well. This pull request has now been integrated. Changeset: 78fde685 Author: Jan Lahoda Committer: Erik Joelsson URL: https://git.openjdk.org/skara/commit/78fde68556aaa3d5b53273fdc22255ca10ca5769 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod 2200: The jdk/internal/javac package should be mapped to the compiler label Reviewed-by: jjg, ihse, vromero ------------- PR: https://git.openjdk.org/skara/pull/1621 From zsong at openjdk.org Mon Mar 18 17:58:49 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 18 Mar 2024 17:58:49 GMT Subject: RFR: 2201: Only fetch comments once in PullRequestWorkItem in pr bot Message-ID: In pr bot, we are still fetching comments from the remote forge instead of using the cache after [SKARA-1709](https://bugs.openjdk.org/browse/SKARA-1709). ------------- Commit messages: - SKARA-2201 Changes: https://git.openjdk.org/skara/pull/1622/files Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1622&range=00 Issue: https://bugs.openjdk.org/browse/SKARA-2201 Stats: 8 lines in 2 files changed: 0 ins; 1 del; 7 mod Patch: https://git.openjdk.org/skara/pull/1622.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1622/head:pull/1622 PR: https://git.openjdk.org/skara/pull/1622 From erikj at openjdk.org Mon Mar 18 18:31:40 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Mon, 18 Mar 2024 18:31:40 GMT Subject: RFR: 2201: Only fetch comments once in PullRequestWorkItem in pr bot In-Reply-To: References: Message-ID: On Mon, 18 Mar 2024 17:42:49 GMT, Zhao Song wrote: > In pr bot, we are still fetching comments from the remote forge instead of using the cache after [SKARA-1709](https://bugs.openjdk.org/browse/SKARA-1709). Marked as reviewed by erikj (Lead). bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1440: > 1438: > 1439: // Calculate current metadata to avoid unnecessary future checks > 1440: var metadata = workItem.getMetadata(workItem.getPRMetadata(censusInstance, title, updatedBody, pr.comments(), activeReviews, This one is an actual bug. It could prevent a future run from realizing a relevant comment change took place since the last check run. It's important that the hash we save is done on the data we used when evaluating the PR. Thanks for fixing this! ------------- PR Review: https://git.openjdk.org/skara/pull/1622#pullrequestreview-1943873182 PR Review Comment: https://git.openjdk.org/skara/pull/1622#discussion_r1529055801 From zsong at openjdk.org Mon Mar 18 18:39:11 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 18 Mar 2024 18:39:11 GMT Subject: RFR: 2201: Only fetch comments once in PullRequestWorkItem in pr bot In-Reply-To: References: Message-ID: On Mon, 18 Mar 2024 18:29:27 GMT, Erik Joelsson wrote: >> In pr bot, we are still fetching comments from the remote forge instead of using the cache after [SKARA-1709](https://bugs.openjdk.org/browse/SKARA-1709). > > bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1440: > >> 1438: >> 1439: // Calculate current metadata to avoid unnecessary future checks >> 1440: var metadata = workItem.getMetadata(workItem.getPRMetadata(censusInstance, title, updatedBody, pr.comments(), activeReviews, > > This one is an actual bug. It could prevent a future run from realizing a relevant comment change took place since the last check run. It's important that the hash we save is done on the data we used when evaluating the PR. Thanks for fixing this! Yes, it's a bug and I didn't catch it when I was implementing [SKARA-1912](https://bugs.openjdk.org/browse/SKARA-1912). ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1622#discussion_r1529065410 From zsong at openjdk.org Mon Mar 18 19:36:16 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 18 Mar 2024 19:36:16 GMT Subject: RFR: 2201: Only fetch comments once in PullRequestWorkItem in pr bot In-Reply-To: References: Message-ID: On Mon, 18 Mar 2024 17:42:49 GMT, Zhao Song wrote: > In pr bot, we are still fetching comments from the remote forge instead of using the cache after [SKARA-1709](https://bugs.openjdk.org/browse/SKARA-1709). Thanks for the review! ------------- PR Comment: https://git.openjdk.org/skara/pull/1622#issuecomment-2004764213 From zsong at openjdk.org Mon Mar 18 19:36:16 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 18 Mar 2024 19:36:16 GMT Subject: Integrated: 2201: Only fetch comments once in PullRequestWorkItem in pr bot In-Reply-To: References: Message-ID: <5EFILAZExRJmOF13ANlCGH79npNG4fDdnQ6Jm3UwPNY=.06eabc17-633d-4ef5-9b8f-71d7c8e6b1e8@github.com> On Mon, 18 Mar 2024 17:42:49 GMT, Zhao Song wrote: > In pr bot, we are still fetching comments from the remote forge instead of using the cache after [SKARA-1709](https://bugs.openjdk.org/browse/SKARA-1709). This pull request has now been integrated. Changeset: 8abaa412 Author: Zhao Song URL: https://git.openjdk.org/skara/commit/8abaa412dbaae63113851c80dce2d32439a8e9c9 Stats: 8 lines in 2 files changed: 0 ins; 1 del; 7 mod 2201: Only fetch comments once in PullRequestWorkItem in pr bot Reviewed-by: erikj ------------- PR: https://git.openjdk.org/skara/pull/1622 From zsong at openjdk.org Mon Mar 18 19:50:42 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 18 Mar 2024 19:50:42 GMT Subject: RFR: 2197: Make the /backport command support a "repo:branch" argument In-Reply-To: References: Message-ID: On Fri, 15 Mar 2024 18:47:16 GMT, Zhao Song wrote: > This patch is trying to make /backport command support `repo:branch` argument. > > And as ErikD suggested, `repo` should be optional if the user is backporting to a different branch in the same repository. > >> To make it slightly more convenient to backport a commit to a branch in the same repository as the commit is residing in we would allow short form "/backport :branch" (this is also fully backwards compatible and cannot become ambiguous in the future). Thanks for the review! ------------- PR Comment: https://git.openjdk.org/skara/pull/1620#issuecomment-2004789871 From zsong at openjdk.org Mon Mar 18 19:50:42 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 18 Mar 2024 19:50:42 GMT Subject: Integrated: 2197: Make the /backport command support a "repo:branch" argument In-Reply-To: References: Message-ID: On Fri, 15 Mar 2024 18:47:16 GMT, Zhao Song wrote: > This patch is trying to make /backport command support `repo:branch` argument. > > And as ErikD suggested, `repo` should be optional if the user is backporting to a different branch in the same repository. > >> To make it slightly more convenient to backport a commit to a branch in the same repository as the commit is residing in we would allow short form "/backport :branch" (this is also fully backwards compatible and cannot become ambiguous in the future). This pull request has now been integrated. Changeset: 42bfbedd Author: Zhao Song URL: https://git.openjdk.org/skara/commit/42bfbeddb560c9a65a6712e20b5cba0f5b15d5b0 Stats: 63 lines in 3 files changed: 56 ins; 0 del; 7 mod 2197: Make the /backport command support a "repo:branch" argument Reviewed-by: erikj ------------- PR: https://git.openjdk.org/skara/pull/1620 From zsong at openjdk.org Wed Mar 20 22:35:41 2024 From: zsong at openjdk.org (Zhao Song) Date: Wed, 20 Mar 2024 22:35:41 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required Message-ID: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> This patch is trying to let the pr bot automatically requires csr for a backport PR if one of the associated has a resolved CSR. ------------- Commit messages: - fix test - update - add test - update - SKARA-2198 Changes: https://git.openjdk.org/skara/pull/1623/files Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1623&range=00 Issue: https://bugs.openjdk.org/browse/SKARA-2198 Stats: 206 lines in 3 files changed: 171 ins; 19 del; 16 mod Patch: https://git.openjdk.org/skara/pull/1623.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1623/head:pull/1623 PR: https://git.openjdk.org/skara/pull/1623 From zsong at openjdk.org Wed Mar 20 22:49:34 2024 From: zsong at openjdk.org (Zhao Song) Date: Wed, 20 Mar 2024 22:49:34 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v2] In-Reply-To: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: > This patch is trying to let the pr bot automatically requires csr for a backport PR if one of the associated has a resolved CSR. Zhao Song has updated the pull request incrementally with one additional commit since the last revision: Make CSR process link a constant ------------- Changes: - all: https://git.openjdk.org/skara/pull/1623/files - new: https://git.openjdk.org/skara/pull/1623/files/df42e981..3ca1d71d Webrevs: - full: https://webrevs.openjdk.org/?repo=skara&pr=1623&range=01 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1623&range=00-01 Stats: 47 lines in 3 files changed: 4 ins; 0 del; 43 mod Patch: https://git.openjdk.org/skara/pull/1623.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1623/head:pull/1623 PR: https://git.openjdk.org/skara/pull/1623 From erikj at openjdk.org Thu Mar 21 20:17:17 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Thu, 21 Mar 2024 20:17:17 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v2] In-Reply-To: References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: On Wed, 20 Mar 2024 22:49:34 GMT, Zhao Song wrote: >> This patch is trying to let the pr bot automatically requires csr for a backport PR if one of the associated has a resolved CSR. > > Zhao Song has updated the pull request incrementally with one additional commit since the last revision: > > Make CSR process link a constant bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1566: > 1564: .filter(Optional::isPresent) > 1565: .map(Optional::get) > 1566: .map(Backports::csrLink) I'm a bit concerned that we will be going through csrLinks twice, first to see if there are any associated CSRs and then here to see if there are any resolved ones. Not sure if there is a feasible way to either combine the checks or cache the results between them. bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1580: > 1578: "This backport might also need a CSR. `csr` label will be added to this PR.\n" + > 1579: "Please go through the [CSR](" + CSR_PROCESS_LINK + > 1580: ") process or using command `csr unneeded` to remove the CSR requirement."); There is no need to use single newlines, they will just be ignored when the comment is formatted anyway. Suggestion: pr.addComment("At least one of the issues associated with this backport has a resolved " + "[CSR](" + CSR_PROCESS_LINK + ") for a different version. As this means that this " + "backport may also need a CSR, the `csr` label is being added to this pull request " + "to signal this potential requirement. The command `/csr unneeded` can be used to " + "remove the label in case a CSR is not needed."); ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1623#discussion_r1534578430 PR Review Comment: https://git.openjdk.org/skara/pull/1623#discussion_r1534613574 From erikj at openjdk.org Thu Mar 21 20:17:17 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Thu, 21 Mar 2024 20:17:17 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v2] In-Reply-To: References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: On Thu, 21 Mar 2024 20:10:20 GMT, Erik Joelsson wrote: >> Zhao Song has updated the pull request incrementally with one additional commit since the last revision: >> >> Make CSR process link a constant > > bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1580: > >> 1578: "This backport might also need a CSR. `csr` label will be added to this PR.\n" + >> 1579: "Please go through the [CSR](" + CSR_PROCESS_LINK + >> 1580: ") process or using command `csr unneeded` to remove the CSR requirement."); > > There is no need to use single newlines, they will just be ignored when the comment is formatted anyway. > > Suggestion: > > pr.addComment("At least one of the issues associated with this backport has a resolved " + > "[CSR](" + CSR_PROCESS_LINK + ") for a different version. As this means that this " + > "backport may also need a CSR, the `csr` label is being added to this pull request " + > "to signal this potential requirement. The command `/csr unneeded` can be used to " + > "remove the label in case a CSR is not needed."); If something goes wrong in CheckRun after posting this comment and before the labels are updated, we run the risk of posting this comment multiple times. We should add a marker in the comment and check that we haven't posted one before. ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1623#discussion_r1534615355 From zsong at openjdk.org Thu Mar 21 20:59:39 2024 From: zsong at openjdk.org (Zhao Song) Date: Thu, 21 Mar 2024 20:59:39 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v3] In-Reply-To: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: <4lMznSXRJ7bd3ta3oyedYWMAqFvT5wauZnRvjuqIlv0=.d5080793-1ccc-4b01-b232-c25dfc63b5bf@github.com> > This patch is trying to let the pr bot automatically requires csr for a backport PR if one of the associated has a resolved CSR. Zhao Song has updated the pull request incrementally with one additional commit since the last revision: Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com> ------------- Changes: - all: https://git.openjdk.org/skara/pull/1623/files - new: https://git.openjdk.org/skara/pull/1623/files/3ca1d71d..82f18f2d Webrevs: - full: https://webrevs.openjdk.org/?repo=skara&pr=1623&range=02 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1623&range=01-02 Stats: 5 lines in 1 file changed: 1 ins; 0 del; 4 mod Patch: https://git.openjdk.org/skara/pull/1623.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1623/head:pull/1623 PR: https://git.openjdk.org/skara/pull/1623 From zsong at openjdk.org Thu Mar 21 20:59:40 2024 From: zsong at openjdk.org (Zhao Song) Date: Thu, 21 Mar 2024 20:59:40 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v2] In-Reply-To: References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: On Thu, 21 Mar 2024 20:12:04 GMT, Erik Joelsson wrote: >> bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1580: >> >>> 1578: "This backport might also need a CSR. `csr` label will be added to this PR.\n" + >>> 1579: "Please go through the [CSR](" + CSR_PROCESS_LINK + >>> 1580: ") process or using command `csr unneeded` to remove the CSR requirement."); >> >> There is no need to use single newlines, they will just be ignored when the comment is formatted anyway. >> >> Suggestion: >> >> pr.addComment("At least one of the issues associated with this backport has a resolved " + >> "[CSR](" + CSR_PROCESS_LINK + ") for a different version. As this means that this " + >> "backport may also need a CSR, the `csr` label is being added to this pull request " + >> "to signal this potential requirement. The command `/csr unneeded` can be used to " + >> "remove the label in case a CSR is not needed."); > > If something goes wrong in CheckRun after posting this comment and before the labels are updated, we run the risk of posting this comment multiple times. We should add a marker in the comment and check that we haven't posted one before. Right, thanks for catching it! ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1623#discussion_r1534670877 From zsong at openjdk.org Thu Mar 21 21:55:52 2024 From: zsong at openjdk.org (Zhao Song) Date: Thu, 21 Mar 2024 21:55:52 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v4] In-Reply-To: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: > This patch is trying to let the pr bot automatically requires csr for a backport PR if one of the associated has a resolved CSR. Zhao Song has updated the pull request incrementally with one additional commit since the last revision: review comment ------------- Changes: - all: https://git.openjdk.org/skara/pull/1623/files - new: https://git.openjdk.org/skara/pull/1623/files/82f18f2d..a20024f8 Webrevs: - full: https://webrevs.openjdk.org/?repo=skara&pr=1623&range=03 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1623&range=02-03 Stats: 14 lines in 2 files changed: 6 ins; 1 del; 7 mod Patch: https://git.openjdk.org/skara/pull/1623.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1623/head:pull/1623 PR: https://git.openjdk.org/skara/pull/1623 From zsong at openjdk.org Fri Mar 22 00:20:46 2024 From: zsong at openjdk.org (Zhao Song) Date: Fri, 22 Mar 2024 00:20:46 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v5] In-Reply-To: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: > This patch is trying to let the pr bot automatically requires csr for a backport PR if one of the associated has a resolved CSR. Zhao Song has updated the pull request incrementally with two additional commits since the last revision: - update - update ------------- Changes: - all: https://git.openjdk.org/skara/pull/1623/files - new: https://git.openjdk.org/skara/pull/1623/files/a20024f8..1a8aa85a Webrevs: - full: https://webrevs.openjdk.org/?repo=skara&pr=1623&range=04 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1623&range=03-04 Stats: 34 lines in 1 file changed: 18 ins; 5 del; 11 mod Patch: https://git.openjdk.org/skara/pull/1623.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1623/head:pull/1623 PR: https://git.openjdk.org/skara/pull/1623 From zsong at openjdk.org Fri Mar 22 00:20:46 2024 From: zsong at openjdk.org (Zhao Song) Date: Fri, 22 Mar 2024 00:20:46 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v2] In-Reply-To: References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: On Thu, 21 Mar 2024 19:51:57 GMT, Erik Joelsson wrote: >> Zhao Song has updated the pull request incrementally with one additional commit since the last revision: >> >> Make CSR process link a constant > > bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1566: > >> 1564: .filter(Optional::isPresent) >> 1565: .map(Optional::get) >> 1566: .map(Backports::csrLink) > > I'm a bit concerned that we will be going through csrLinks twice, first to see if there are any associated CSRs and then here to see if there are any resolved ones. Not sure if there is a feasible way to either combine the checks or cache the results between them. I tried, but the code right now seems a bit complicated. ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1623#discussion_r1534885222 From erikj at openjdk.org Fri Mar 22 14:27:13 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Fri, 22 Mar 2024 14:27:13 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v5] In-Reply-To: References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: On Fri, 22 Mar 2024 00:20:46 GMT, Zhao Song wrote: >> This patch is trying to let the pr bot automatically requires csr for a backport PR if one of the associated has a resolved CSR. > > Zhao Song has updated the pull request incrementally with two additional commits since the last revision: > > - update > - update Marked as reviewed by erikj (Lead). ------------- PR Review: https://git.openjdk.org/skara/pull/1623#pullrequestreview-1954949235 From erikj at openjdk.org Fri Mar 22 14:27:13 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Fri, 22 Mar 2024 14:27:13 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v2] In-Reply-To: References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: <5569Rzc8Z4dO_lAJ3VqKK8XCqKqH5OxKYifIlptvS5E=.7b9b5de2-47c2-4368-b4c8-e23fc1ba800d@github.com> On Fri, 22 Mar 2024 00:18:05 GMT, Zhao Song wrote: >> bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1566: >> >>> 1564: .filter(Optional::isPresent) >>> 1565: .map(Optional::get) >>> 1566: .map(Backports::csrLink) >> >> I'm a bit concerned that we will be going through csrLinks twice, first to see if there are any associated CSRs and then here to see if there are any resolved ones. Not sure if there is a feasible way to either combine the checks or cache the results between them. > > I tried, but the code right now seems a bit complicated. I think it's fine. Maybe it would help with a comment on each method explaining what exactly it's constructing. ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1623#discussion_r1535676127 From zsong at openjdk.org Fri Mar 22 16:01:21 2024 From: zsong at openjdk.org (Zhao Song) Date: Fri, 22 Mar 2024 16:01:21 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v2] In-Reply-To: <5569Rzc8Z4dO_lAJ3VqKK8XCqKqH5OxKYifIlptvS5E=.7b9b5de2-47c2-4368-b4c8-e23fc1ba800d@github.com> References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> <5569Rzc8Z4dO_lAJ3VqKK8XCqKqH5OxKYifIlptvS5E=.7b9b5de2-47c2-4368-b4c8-e23fc1ba800d@github.com> Message-ID: On Fri, 22 Mar 2024 14:24:59 GMT, Erik Joelsson wrote: >> I tried, but the code right now seems a bit complicated. > > I think it's fine. Maybe it would help with a comment on each method explaining what exactly it's constructing. Sure, I will add some comments ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1623#discussion_r1535816891 From zsong at openjdk.org Fri Mar 22 17:30:46 2024 From: zsong at openjdk.org (Zhao Song) Date: Fri, 22 Mar 2024 17:30:46 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v6] In-Reply-To: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: > This patch is trying to let the pr bot automatically requires csr for a backport PR if one of the associated has a resolved CSR. Zhao Song has updated the pull request incrementally with one additional commit since the last revision: add comment ------------- Changes: - all: https://git.openjdk.org/skara/pull/1623/files - new: https://git.openjdk.org/skara/pull/1623/files/1a8aa85a..c7c6ba58 Webrevs: - full: https://webrevs.openjdk.org/?repo=skara&pr=1623&range=05 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1623&range=04-05 Stats: 8 lines in 1 file changed: 5 ins; 0 del; 3 mod Patch: https://git.openjdk.org/skara/pull/1623.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1623/head:pull/1623 PR: https://git.openjdk.org/skara/pull/1623 From erikj at openjdk.org Fri Mar 22 19:58:07 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Fri, 22 Mar 2024 19:58:07 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v6] In-Reply-To: References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: On Fri, 22 Mar 2024 17:30:46 GMT, Zhao Song wrote: >> This patch is trying to let the pr bot automatically requires csr for a backport PR if one of the associated has a resolved CSR. > > Zhao Song has updated the pull request incrementally with one additional commit since the last revision: > > add comment bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1648: > 1646: * Iterate through each entry in the regularIssuesMap. If the value is present, get all CSR links associated with this issue. > 1647: * "all CSR links" means that the CSR linked with the primary issue and the CSRs linked with any backport issues of the primary issue. > 1648: * Constructs a map from main issue ID to all CSR links. I would like to comment to be more about what the return value is, not how it's created. Suggestion: * Creates a map from issue ID to a list of all CSRs linked from the issue or any backport of the issue. bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1650: > 1648: * Constructs a map from main issue ID to all CSR links. > 1649: */ > 1650: private Map> issueToCsrLinksMap(Map> regularIssuesMap) { Looking at this some more, I think it would make more sense if we made the map from issue ID to `List`. Both consumers of this map map to the linked Issue anyway. Suggestion: private Map> issueToAllCsrsMap(Map> regularIssuesMap) { ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1623#discussion_r1536121261 PR Review Comment: https://git.openjdk.org/skara/pull/1623#discussion_r1536127517 From zsong at openjdk.org Fri Mar 22 20:06:18 2024 From: zsong at openjdk.org (Zhao Song) Date: Fri, 22 Mar 2024 20:06:18 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v7] In-Reply-To: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: > This patch is trying to let the pr bot automatically requires csr for a backport PR if one of the associated has a resolved CSR. Zhao Song has updated the pull request incrementally with two additional commits since the last revision: - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com> - Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com> ------------- Changes: - all: https://git.openjdk.org/skara/pull/1623/files - new: https://git.openjdk.org/skara/pull/1623/files/c7c6ba58..d4b768dc Webrevs: - full: https://webrevs.openjdk.org/?repo=skara&pr=1623&range=06 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1623&range=05-06 Stats: 4 lines in 1 file changed: 0 ins; 2 del; 2 mod Patch: https://git.openjdk.org/skara/pull/1623.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1623/head:pull/1623 PR: https://git.openjdk.org/skara/pull/1623 From zsong at openjdk.org Fri Mar 22 20:06:18 2024 From: zsong at openjdk.org (Zhao Song) Date: Fri, 22 Mar 2024 20:06:18 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v6] In-Reply-To: References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: On Fri, 22 Mar 2024 19:55:12 GMT, Erik Joelsson wrote: >> Zhao Song has updated the pull request incrementally with one additional commit since the last revision: >> >> add comment > > bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java line 1650: > >> 1648: * Constructs a map from main issue ID to all CSR links. >> 1649: */ >> 1650: private Map> issueToCsrLinksMap(Map> regularIssuesMap) { > > Looking at this some more, I think it would make more sense if we made the map from issue ID to `List`. Both consumers of this map map to the linked Issue anyway. > Suggestion: > > private Map> issueToAllCsrsMap(Map> regularIssuesMap) { Make sense. Will change it ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1623#discussion_r1536137314 From zsong at openjdk.org Fri Mar 22 20:50:41 2024 From: zsong at openjdk.org (Zhao Song) Date: Fri, 22 Mar 2024 20:50:41 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v8] In-Reply-To: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: > This patch is trying to let the pr bot automatically requires csr for a backport PR if one of the associated has a resolved CSR. Zhao Song has updated the pull request incrementally with one additional commit since the last revision: update ------------- Changes: - all: https://git.openjdk.org/skara/pull/1623/files - new: https://git.openjdk.org/skara/pull/1623/files/d4b768dc..912f943a Webrevs: - full: https://webrevs.openjdk.org/?repo=skara&pr=1623&range=07 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1623&range=06-07 Stats: 35 lines in 1 file changed: 8 ins; 7 del; 20 mod Patch: https://git.openjdk.org/skara/pull/1623.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1623/head:pull/1623 PR: https://git.openjdk.org/skara/pull/1623 From erikj at openjdk.org Fri Mar 22 21:39:17 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Fri, 22 Mar 2024 21:39:17 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v8] In-Reply-To: References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: On Fri, 22 Mar 2024 20:50:41 GMT, Zhao Song wrote: >> This patch is trying to let the pr bot automatically requires csr for a backport PR if one of the associated has a resolved CSR. > > Zhao Song has updated the pull request incrementally with one additional commit since the last revision: > > update Marked as reviewed by erikj (Lead). ------------- PR Review: https://git.openjdk.org/skara/pull/1623#pullrequestreview-1955837395 From zsong at openjdk.org Mon Mar 25 18:05:24 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 25 Mar 2024 18:05:24 GMT Subject: RFR: 2210: Use authenticatedUrl instead of webUrl in MergeBot Message-ID: Since the bot uses ssh to clone the repos in MergeBot, the bot should also use authenticatedUrl(ssh url) to access the remote repo. However, the mergeBot is still using webUrl(https url) in some places and it triggered an issue today. ------------- Commit messages: - SKARA-2210 Changes: https://git.openjdk.org/skara/pull/1624/files Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1624&range=00 Issue: https://bugs.openjdk.org/browse/SKARA-2210 Stats: 4 lines in 1 file changed: 0 ins; 2 del; 2 mod Patch: https://git.openjdk.org/skara/pull/1624.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1624/head:pull/1624 PR: https://git.openjdk.org/skara/pull/1624 From erikj at openjdk.org Mon Mar 25 18:09:27 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Mon, 25 Mar 2024 18:09:27 GMT Subject: RFR: 2210: Use authenticatedUrl instead of webUrl in MergeBot In-Reply-To: References: Message-ID: On Mon, 25 Mar 2024 17:44:15 GMT, Zhao Song wrote: > Since the bot uses ssh to clone the repos in MergeBot, the bot should also use authenticatedUrl(ssh url) to access the remote repo. However, the mergeBot is still using webUrl(https url) in some places and it triggered an issue today. Marked as reviewed by erikj (Lead). ------------- PR Review: https://git.openjdk.org/skara/pull/1624#pullrequestreview-1958456325 From zsong at openjdk.org Mon Mar 25 18:14:35 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 25 Mar 2024 18:14:35 GMT Subject: RFR: 2210: Use authenticatedUrl instead of webUrl in MergeBot In-Reply-To: References: Message-ID: On Mon, 25 Mar 2024 17:44:15 GMT, Zhao Song wrote: > Since the bot uses ssh to clone the repos in MergeBot, the bot should also use authenticatedUrl(ssh url) to access the remote repo. However, the mergeBot is still using webUrl(https url) in some places and it triggered an issue today. Thanks! ------------- PR Comment: https://git.openjdk.org/skara/pull/1624#issuecomment-2018610690 From zsong at openjdk.org Mon Mar 25 18:14:35 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 25 Mar 2024 18:14:35 GMT Subject: Integrated: 2210: Use authenticatedUrl instead of webUrl in MergeBot In-Reply-To: References: Message-ID: On Mon, 25 Mar 2024 17:44:15 GMT, Zhao Song wrote: > Since the bot uses ssh to clone the repos in MergeBot, the bot should also use authenticatedUrl(ssh url) to access the remote repo. However, the mergeBot is still using webUrl(https url) in some places and it triggered an issue today. This pull request has now been integrated. Changeset: 7fbecfa9 Author: Zhao Song URL: https://git.openjdk.org/skara/commit/7fbecfa945452055f2e353b1a6d25afe48f35296 Stats: 4 lines in 1 file changed: 0 ins; 2 del; 2 mod 2210: Use authenticatedUrl instead of webUrl in MergeBot Reviewed-by: erikj ------------- PR: https://git.openjdk.org/skara/pull/1624 From zsong at openjdk.org Mon Mar 25 19:55:07 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 25 Mar 2024 19:55:07 GMT Subject: RFR: 2198: Backport PRs should check if a CSR is required [v8] In-Reply-To: References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: On Fri, 22 Mar 2024 20:50:41 GMT, Zhao Song wrote: >> This patch is trying to let the pr bot automatically requires csr for a backport PR if one of the associated has a resolved CSR. > > Zhao Song has updated the pull request incrementally with one additional commit since the last revision: > > update Thanks for the review! ------------- PR Comment: https://git.openjdk.org/skara/pull/1623#issuecomment-2018793350 From zsong at openjdk.org Mon Mar 25 19:55:07 2024 From: zsong at openjdk.org (Zhao Song) Date: Mon, 25 Mar 2024 19:55:07 GMT Subject: Integrated: 2198: Backport PRs should check if a CSR is required In-Reply-To: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> References: <97OvMaGxsR_NfWx-thSOA7Z9K3w9GsEz5L3L5zS7UKs=.01974f98-a181-4ab1-bc82-8bde747b4bab@github.com> Message-ID: On Wed, 20 Mar 2024 19:11:05 GMT, Zhao Song wrote: > This patch is trying to let the pr bot automatically requires csr for a backport PR if one of the associated has a resolved CSR. This pull request has now been integrated. Changeset: e98ed9ae Author: Zhao Song URL: https://git.openjdk.org/skara/commit/e98ed9aebd4445ee70a330072415ba00ab95a792 Stats: 280 lines in 4 files changed: 200 ins; 21 del; 59 mod 2198: Backport PRs should check if a CSR is required Reviewed-by: erikj ------------- PR: https://git.openjdk.org/skara/pull/1623 From zsong at openjdk.org Tue Mar 26 18:27:22 2024 From: zsong at openjdk.org (Zhao Song) Date: Tue, 26 Mar 2024 18:27:22 GMT Subject: RFR: 2214: Require CSR again if all of the CSRs are withdrawn in a Backport CSR PR Message-ID: When testing [SKARA-2198](https://bugs.openjdk.org/browse/SKARA-2198), I found that there is a bug. When determining if the bot should add the csr label to a backport CSR pr, if the bot found the pr is already associated with any CSR(regardless if it's withdrawn or not), then the bot would not add the csr label. This is a bug. A user could create a CSR for this pr and withdraw it, then the user could bypass the CSR request. The bot should ignore withdrawn CSRs in this case. ------------- Commit messages: - SKARA-2214 Changes: https://git.openjdk.org/skara/pull/1625/files Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1625&range=00 Issue: https://bugs.openjdk.org/browse/SKARA-2214 Stats: 5 lines in 1 file changed: 4 ins; 0 del; 1 mod Patch: https://git.openjdk.org/skara/pull/1625.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1625/head:pull/1625 PR: https://git.openjdk.org/skara/pull/1625 From erikj at openjdk.org Tue Mar 26 20:18:43 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Tue, 26 Mar 2024 20:18:43 GMT Subject: RFR: 2214: Require CSR again if all of the CSRs are withdrawn in a Backport CSR PR In-Reply-To: References: Message-ID: <4UG6nqS1__ePraMjuDVKFQePzNEAuOrYQvtt00Su-mQ=.6cfbcac7-b699-4a06-8aaa-48d97d1b77fc@github.com> On Tue, 26 Mar 2024 18:18:51 GMT, Zhao Song wrote: > When testing [SKARA-2198](https://bugs.openjdk.org/browse/SKARA-2198), I found that there is a bug. > > When determining if the bot should add the csr label to a backport CSR pr, if the bot found the pr is already associated with any CSR(regardless if it's withdrawn or not), then the bot would not add the csr label. > > This is a bug. A user could create a CSR for this pr and withdraw it, then the user could bypass the CSR request. > > The bot should ignore withdrawn CSRs in this case. Marked as reviewed by erikj (Lead). ------------- PR Review: https://git.openjdk.org/skara/pull/1625#pullrequestreview-1961619139 From zsong at openjdk.org Tue Mar 26 20:57:43 2024 From: zsong at openjdk.org (Zhao Song) Date: Tue, 26 Mar 2024 20:57:43 GMT Subject: RFR: 2214: Require CSR again if all of the CSRs are withdrawn in a Backport CSR PR In-Reply-To: References: Message-ID: On Tue, 26 Mar 2024 18:18:51 GMT, Zhao Song wrote: > When testing [SKARA-2198](https://bugs.openjdk.org/browse/SKARA-2198), I found that there is a bug. > > When determining if the bot should add the csr label to a backport CSR pr, if the bot found the pr is already associated with any CSR(regardless if it's withdrawn or not), then the bot would not add the csr label. > > This is a bug. A user could create a CSR for this pr and withdraw it, then the user could bypass the CSR request. > > The bot should ignore withdrawn CSRs in this case. Thanks for the review! ------------- PR Comment: https://git.openjdk.org/skara/pull/1625#issuecomment-2021456836 From zsong at openjdk.org Tue Mar 26 20:57:43 2024 From: zsong at openjdk.org (Zhao Song) Date: Tue, 26 Mar 2024 20:57:43 GMT Subject: Integrated: 2214: Require CSR again if all of the CSRs are withdrawn in a Backport CSR PR In-Reply-To: References: Message-ID: <5OdKfk46NnesslCLD__E6q5dMX9GopZFzyHau1sr75Y=.dca2a37a-a44c-4f51-9538-7cd39fb84e88@github.com> On Tue, 26 Mar 2024 18:18:51 GMT, Zhao Song wrote: > When testing [SKARA-2198](https://bugs.openjdk.org/browse/SKARA-2198), I found that there is a bug. > > When determining if the bot should add the csr label to a backport CSR pr, if the bot found the pr is already associated with any CSR(regardless if it's withdrawn or not), then the bot would not add the csr label. > > This is a bug. A user could create a CSR for this pr and withdraw it, then the user could bypass the CSR request. > > The bot should ignore withdrawn CSRs in this case. This pull request has now been integrated. Changeset: 5f4c1ce6 Author: Zhao Song URL: https://git.openjdk.org/skara/commit/5f4c1ce6250e5010eb3085ab547f4d78862da3b8 Stats: 5 lines in 1 file changed: 4 ins; 0 del; 1 mod 2214: Require CSR again if all of the CSRs are withdrawn in a Backport CSR PR Reviewed-by: erikj ------------- PR: https://git.openjdk.org/skara/pull/1625 From zsong at openjdk.org Wed Mar 27 22:40:21 2024 From: zsong at openjdk.org (Zhao Song) Date: Wed, 27 Mar 2024 22:40:21 GMT Subject: RFR: 2213: Record reviewers with stale reviews in the commit message Message-ID: As a user requested, when `ignoreStaleReview` is enabled in a repo, Skara bot should still record reviewers with stale reviews in the commit message. ------------- Commit messages: - SKARA-2213 Changes: https://git.openjdk.org/skara/pull/1626/files Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1626&range=00 Issue: https://bugs.openjdk.org/browse/SKARA-2213 Stats: 37 lines in 5 files changed: 16 ins; 1 del; 20 mod Patch: https://git.openjdk.org/skara/pull/1626.diff Fetch: git fetch https://git.openjdk.org/skara.git pull/1626/head:pull/1626 PR: https://git.openjdk.org/skara/pull/1626 From erikj at openjdk.org Thu Mar 28 12:58:59 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Thu, 28 Mar 2024 12:58:59 GMT Subject: RFR: 2213: Record reviewers with stale reviews in the commit message In-Reply-To: References: Message-ID: On Wed, 27 Mar 2024 22:18:11 GMT, Zhao Song wrote: > As a user requested, when `ignoreStaleReview` is enabled in a repo, Skara bot should still record reviewers with stale reviews in the commit message. bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckablePullRequest.java line 83: > 81: > 82: if (manualReviewersAndStaleReviewers) { > 83: reviewers.addAll(Reviewers.reviewers(currentUser, comments)); In the old code, if someone did a non approved verdict review and was added manually as a reviewer, they would not get reviewer credit. With this change, we unconditionally add all manual reviewers. That is probably how most people would expect the command to work though. @kevinrushforth do you have an opinion here? bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckablePullRequest.java line 91: > 89: } > 90: } > 91: reviewers.addAll(reviewerNames(staleReviews, namespace)); I think all of this could be replaced with just adding `manualReviewersAndStaleReviewers` to the filter condition at line 76. ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1626#discussion_r1542916085 PR Review Comment: https://git.openjdk.org/skara/pull/1626#discussion_r1542911977 From kcr at openjdk.org Thu Mar 28 13:33:19 2024 From: kcr at openjdk.org (Kevin Rushforth) Date: Thu, 28 Mar 2024 13:33:19 GMT Subject: RFR: 2213: Record reviewers with stale reviews in the commit message In-Reply-To: References: Message-ID: On Thu, 28 Mar 2024 12:55:06 GMT, Erik Joelsson wrote: >> As a user requested, when `ignoreStaleReview` is enabled in a repo, Skara bot should still record reviewers with stale reviews in the commit message. > > bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckablePullRequest.java line 83: > >> 81: >> 82: if (manualReviewersAndStaleReviewers) { >> 83: reviewers.addAll(Reviewers.reviewers(currentUser, comments)); > > In the old code, if someone did a non approved verdict review and was added manually as a reviewer, they would not get reviewer credit. With this change, we unconditionally add all manual reviewers. That is probably how most people would expect the command to work though. @kevinrushforth do you have an opinion here? Yes, it seems expected that all manually credited reviewers would be added regardless of whether or not they had also done a non-approving review. I presume there will be no change in behavior in the (vast majority) of cases where the PR author has not used the `/reviewer credit` command: only approving reviewers should be added and not those who had done a non-approving review? ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1626#discussion_r1542986599 From erikj at openjdk.org Thu Mar 28 16:31:21 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Thu, 28 Mar 2024 16:31:21 GMT Subject: RFR: 2213: Record reviewers with stale reviews in the commit message In-Reply-To: References: Message-ID: On Thu, 28 Mar 2024 13:31:10 GMT, Kevin Rushforth wrote: >> bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckablePullRequest.java line 83: >> >>> 81: >>> 82: if (manualReviewersAndStaleReviewers) { >>> 83: reviewers.addAll(Reviewers.reviewers(currentUser, comments)); >> >> In the old code, if someone did a non approved verdict review and was added manually as a reviewer, they would not get reviewer credit. With this change, we unconditionally add all manual reviewers. That is probably how most people would expect the command to work though. @kevinrushforth do you have an opinion here? > > Yes, it seems expected that all manually credited reviewers would be added regardless of whether or not they had also done a non-approving review. I presume there will be no change in behavior in the (vast majority) of cases where the PR author has not used the `/reviewer credit` command: only approving reviewers should be added and not those who had done a non-approving review? Correct, that case is unchanged. Since you agree with the new behavior, I'm also ok with it. I did find the old one a bit odd. ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1626#discussion_r1543272476 From zsong at openjdk.org Thu Mar 28 16:43:50 2024 From: zsong at openjdk.org (Zhao Song) Date: Thu, 28 Mar 2024 16:43:50 GMT Subject: RFR: 2213: Record reviewers with stale reviews in the commit message In-Reply-To: References: Message-ID: On Thu, 28 Mar 2024 16:29:08 GMT, Erik Joelsson wrote: >> Yes, it seems expected that all manually credited reviewers would be added regardless of whether or not they had also done a non-approving review. I presume there will be no change in behavior in the (vast majority) of cases where the PR author has not used the `/reviewer credit` command: only approving reviewers should be added and not those who had done a non-approving review? > > Correct, that case is unchanged. Since you agree with the new behavior, I'm also ok with it. I did find the old one a bit odd. I was thinking the old one is a bug... So I changed it ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1626#discussion_r1543290909 From zsong at openjdk.org Thu Mar 28 16:50:57 2024 From: zsong at openjdk.org (Zhao Song) Date: Thu, 28 Mar 2024 16:50:57 GMT Subject: RFR: 2213: Record reviewers with stale reviews in the commit message In-Reply-To: References: Message-ID: On Thu, 28 Mar 2024 12:51:52 GMT, Erik Joelsson wrote: >> As a user requested, when `ignoreStaleReview` is enabled in a repo, Skara bot should still record reviewers with stale reviews in the commit message. > > bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckablePullRequest.java line 91: > >> 89: } >> 90: } >> 91: reviewers.addAll(reviewerNames(staleReviews, namespace)); > > I think all of this could be replaced with just adding `manualReviewersAndStaleReviewers` to the filter condition at line 76. But the review with non-existing commit(e.g. after a reviewer approved the pr, the author force pushed) or the review made when the pr targets a different branch will be filtered out. ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1626#discussion_r1543298627 From zsong at openjdk.org Thu Mar 28 17:15:07 2024 From: zsong at openjdk.org (Zhao Song) Date: Thu, 28 Mar 2024 17:15:07 GMT Subject: RFR: 2213: Record reviewers with stale reviews in the commit message In-Reply-To: References: Message-ID: On Thu, 28 Mar 2024 16:47:40 GMT, Zhao Song wrote: >> bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckablePullRequest.java line 91: >> >>> 89: } >>> 90: } >>> 91: reviewers.addAll(reviewerNames(staleReviews, namespace)); >> >> I think all of this could be replaced with just adding `manualReviewersAndStaleReviewers` to the filter condition at line 76. > > But the review with non-existing commit(e.g. after a reviewer approved the pr, the author force pushed) or the review made when the pr targets a different branch will be filtered out. Or we can add `manualReviewersAndStaleReviewers` to the filter condition at line 74,75,76 ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1626#discussion_r1543339735 From erikj at openjdk.org Thu Mar 28 17:59:57 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Thu, 28 Mar 2024 17:59:57 GMT Subject: RFR: 2213: Record reviewers with stale reviews in the commit message In-Reply-To: References: Message-ID: On Thu, 28 Mar 2024 17:12:57 GMT, Zhao Song wrote: >> But the review with non-existing commit(e.g. after a reviewer approved the pr, the author force pushed) or the review made when the pr targets a different branch will be filtered out. > > Or we can add `manualReviewersAndStaleReviewers` to the filter condition at line 74,75,76 Ah you are right, ignore this suggestion. ------------- PR Review Comment: https://git.openjdk.org/skara/pull/1626#discussion_r1543400623 From erikj at openjdk.org Thu Mar 28 17:59:57 2024 From: erikj at openjdk.org (Erik Joelsson) Date: Thu, 28 Mar 2024 17:59:57 GMT Subject: RFR: 2213: Record reviewers with stale reviews in the commit message In-Reply-To: References: Message-ID: On Wed, 27 Mar 2024 22:18:11 GMT, Zhao Song wrote: > As a user requested, when `ignoreStaleReview` is enabled in a repo, Skara bot should still record reviewers with stale reviews in the commit message. Marked as reviewed by erikj (Lead). ------------- PR Review: https://git.openjdk.org/skara/pull/1626#pullrequestreview-1966900230 From zsong at openjdk.org Thu Mar 28 18:28:40 2024 From: zsong at openjdk.org (Zhao Song) Date: Thu, 28 Mar 2024 18:28:40 GMT Subject: RFR: 2213: Record reviewers with stale reviews in the commit message In-Reply-To: References: Message-ID: On Wed, 27 Mar 2024 22:18:11 GMT, Zhao Song wrote: > As a user requested, when `ignoreStaleReview` is enabled in a repo, Skara bot should still record reviewers with stale reviews in the commit message. Thanks! ------------- PR Comment: https://git.openjdk.org/skara/pull/1626#issuecomment-2025851636 From zsong at openjdk.org Thu Mar 28 18:28:40 2024 From: zsong at openjdk.org (Zhao Song) Date: Thu, 28 Mar 2024 18:28:40 GMT Subject: Integrated: 2213: Record reviewers with stale reviews in the commit message In-Reply-To: References: Message-ID: <-ZYV5mYe_IDc7m1b0xRZZaoEJzAh90HxSHTxCzNxWMw=.6efd1492-f376-471f-bd67-f605ae81789c@github.com> On Wed, 27 Mar 2024 22:18:11 GMT, Zhao Song wrote: > As a user requested, when `ignoreStaleReview` is enabled in a repo, Skara bot should still record reviewers with stale reviews in the commit message. This pull request has now been integrated. Changeset: 9f39d108 Author: Zhao Song URL: https://git.openjdk.org/skara/commit/9f39d1088143aac5f1d2a02bc7e8cb13a8118fb4 Stats: 37 lines in 5 files changed: 16 ins; 1 del; 20 mod 2213: Record reviewers with stale reviews in the commit message Reviewed-by: erikj ------------- PR: https://git.openjdk.org/skara/pull/1626