From weijun at openjdk.java.net Mon Jan 4 15:41:41 2021 From: weijun at openjdk.java.net (Weijun Wang) Date: Mon, 4 Jan 2021 15:41:41 GMT Subject: RFR: "java.se" matches "java.security.jgss" as well In-Reply-To: References: Message-ID: On Tue, 22 Dec 2020 16:41:44 GMT, Xue-Lei Andrew Fan wrote: >> core-libs does not need to care about these security-related modules. > > Marked as reviewed by xuelei (no project role). Hi @rwestberg, can you please sponsor this change? Thanks. ------------- PR: https://git.openjdk.java.net/skara/pull/980 From github.com+27751938+amcap1712 at openjdk.java.net Wed Jan 6 13:13:17 2021 From: github.com+27751938+amcap1712 at openjdk.java.net (Kartik Ohri) Date: Wed, 6 Jan 2021 13:13:17 GMT Subject: Withdrawn: SKARA-758: Add /check pull request command In-Reply-To: References: Message-ID: <2PpfW1lk29IQwFha3HJgLwa7Fo6nyXpIy3lqIyW0zYk=.2304e892-df38-4b31-bce7-11b76d0941c9@github.com> On Tue, 17 Nov 2020 05:46:35 GMT, Kartik Ohri wrote: > Hi! > Kindly review the patch to allow manual execution of jcheck. I think it might be worthwhile to restrict this command to some specific people but I am not sure who that should be (maybe restricting to the author is enough but a reviewer might want to execute it as well in case its urgent). > > I wanted to test this locally by setting up the skara bots on my own repository but was unable to figure out how to do so due to lack of documentation. > Thanks. > Regards, > Kartik This pull request has been closed without being integrated. ------------- PR: https://git.openjdk.java.net/skara/pull/954 From christoph.langer at sap.com Thu Jan 7 23:12:59 2021 From: christoph.langer at sap.com (Langer, Christoph) Date: Thu, 7 Jan 2021 23:12:59 +0000 Subject: Backport Experience Message-ID: Hi Skara Team, I just made my first Skara backport from openjdk to jdk16 [0]. I was following the process described in the Wiki [1]. It seems like there are still some gaps which I?d like to report here. 1. The feature to do a backport by commenting on the original change (which would be very cool and convenient) doesn?t seem to work yet. I commented on the original commit [2] but nothing happened. 2. Then I tried ?git backport? as described in the Wiki - I got: git: 'backport' is not a git command. See 'git --help' (although I ran git skara update before). It seems this is not implemented yet? So, my question would then be: Will this be implemented and if yes, what?s the ETA? ?? Other than that, I?ve got another point which I don?t know whether it can be fixed. In the backport commit on GitHub, one can read: ?Backport-of: 3f9f86f0d3f918b9955ba6ba73c9c58ae8fcf7cb?. It would be cool, if this commit ID could be a link to the original commit. Do you know whether this could be implemented? Otherwise I need to go to the original commit via the indirection of the JBS bug link, which is probably ok-ish, too. Thanks Christoph [0] https://github.com/openjdk/jdk16/pull/95 [1] https://wiki.openjdk.java.net/display/SKARA/Backports [2] https://github.com/openjdk/jdk/commit/3f9f86f0d3f918b9955ba6ba73c9c58ae8fcf7cb#commitcomment-45734116 From sebastian.stenzel at gmail.com Sun Jan 10 14:28:30 2021 From: sebastian.stenzel at gmail.com (Sebastian Stenzel) Date: Sun, 10 Jan 2021 15:28:30 +0100 Subject: Contribution Guide Message-ID: <25E5A5C8-6BE9-4233-B4E2-0F94DDE6C6CB@gmail.com> Hi all, I have recently worked on an issue and would now like to submit a PR. Since most docs still refer to Mercurial, I am unsure in what steps are required to do so. I have submitted the signed OCA on behalf of our organization, but how does it get mapped to my GitHub username? Furthermore, should I just open the PR will some bot trigger the review process? Or should I discuss it on the corresponding mailing list _before_ creating the PR? Is there a naming convention for the PR's title that I need to follow? Thank you! Sebastian From david.holmes at oracle.com Sun Jan 10 22:20:45 2021 From: david.holmes at oracle.com (David Holmes) Date: Mon, 11 Jan 2021 08:20:45 +1000 Subject: Contribution Guide In-Reply-To: <25E5A5C8-6BE9-4233-B4E2-0F94DDE6C6CB@gmail.com> References: <25E5A5C8-6BE9-4233-B4E2-0F94DDE6C6CB@gmail.com> Message-ID: <90b19507-ffaa-67a5-95df-5392ecb1d2ef@oracle.com> Hi Sebastian, On 11/01/2021 12:28 am, Sebastian Stenzel wrote: > Hi all, > > I have recently worked on an issue and would now like to submit a PR. Since most docs still refer to Mercurial, I am unsure in what steps are required to do so. Updates to the guide are in progress. > > I have submitted the signed OCA on behalf of our organization, but how does it get mapped to my GitHub username? There's a manual registration step (at Oracle end) that needs to be done. If you create the PR it will then give you additional instructions. > Furthermore, should I just open the PR will some bot trigger the review process? Or should I discuss it on the corresponding mailing list _before_ creating the PR? The PR will trigger the review process, but you can also discuss prior to the PR if desired. > Is there a naming convention for the PR's title that I need to follow? The PR title must match the JBS issue title (you won't be able to integrate if this is not the case). HTH. David > Thank you! > Sebastian > From joe.darcy at oracle.com Sun Jan 10 22:27:22 2021 From: joe.darcy at oracle.com (Joe Darcy) Date: Sun, 10 Jan 2021 14:27:22 -0800 Subject: Contribution Guide In-Reply-To: <90b19507-ffaa-67a5-95df-5392ecb1d2ef@oracle.com> References: <25E5A5C8-6BE9-4233-B4E2-0F94DDE6C6CB@gmail.com> <90b19507-ffaa-67a5-95df-5392ecb1d2ef@oracle.com> Message-ID: <78afe3b1-e78e-b575-a337-751eb45964d7@oracle.com> On 1/10/2021 2:20 PM, David Holmes wrote: > Hi Sebastian, > > On 11/01/2021 12:28 am, Sebastian Stenzel wrote: >> Hi all, [snip] > >> Furthermore, should I just open the PR will some bot trigger the >> review process? Or should I discuss it on the corresponding mailing >> list _before_ creating the PR? > > The PR will trigger the review process, but you can also discuss prior > to the PR if desired. > In many cases discussion prior to the PR is beneficial and recommended as the actual coding is often only a small portion of the work involved in updating the JDK. Other concerns include deciding if the approach is reasonable given the compatibility constraints of the JDK, etc. HTH, -Joe From sebastian.stenzel at gmail.com Mon Jan 11 09:16:40 2021 From: sebastian.stenzel at gmail.com (Sebastian Stenzel) Date: Mon, 11 Jan 2021 10:16:40 +0100 Subject: Contribution Guide In-Reply-To: <90b19507-ffaa-67a5-95df-5392ecb1d2ef@oracle.com> References: <25E5A5C8-6BE9-4233-B4E2-0F94DDE6C6CB@gmail.com> <90b19507-ffaa-67a5-95df-5392ecb1d2ef@oracle.com> Message-ID: <6B667213-6D44-410E-B8F3-398B5D951600@gmail.com> > On 10. Jan 2021, at 23:20, David Holmes wrote: > >> I have submitted the signed OCA on behalf of our organization, but how does it get mapped to my GitHub username? > > There's a manual registration step (at Oracle end) that needs to be done. If you create the PR it will then give you additional instructions. Thanks for your answers, Joe and David. With that I managed to create my first PR. The one thing that is still unclear to me: Since I signed the OCA for an organization, it affects not one but many usernames that'll be changing over time. How does Oracle know what users are included? Or is it a manual check each time one writes /covered in a PR? Btw I attempted to provide additional information with the "/covered" comment to help Oracle find the right OCA, however the bridgekeeper bot didn't seem to like this [1]. Maybe this can be improved? [1]: https://github.com/openjdk/jdk/pull/2017#issuecomment-757511633 From ihse at openjdk.java.net Mon Jan 11 12:24:01 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 11 Jan 2021 12:24:01 GMT Subject: RFR: "java.se" matches "java.security.jgss" as well In-Reply-To: References: Message-ID: <5NOljG_pp3c-HeZd8BNbVErZbGrAonq74CWegDRAZKM=.2d42749d-f6fd-4218-b30b-2f5a0818da92@github.com> On Mon, 4 Jan 2021 15:39:26 GMT, Weijun Wang wrote: >> Marked as reviewed by xuelei (no project role). > > Hi @rwestberg, can you please sponsor this change? Thanks. It seems like there are more directories that do not end in slash. I think it would be prudent to update them as well. ------------- PR: https://git.openjdk.java.net/skara/pull/980 From rwestberg at openjdk.java.net Mon Jan 11 14:12:56 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Mon, 11 Jan 2021 14:12:56 GMT Subject: RFR: "java.se" matches "java.security.jgss" as well In-Reply-To: References: Message-ID: <77WRxKB7IGTUAzHcwv3blF0GmCatj4IkzymzFDtvTYM=.ab9906ac-59dd-40e2-a0d7-bdfd1169458e@github.com> On Tue, 22 Dec 2020 16:31:21 GMT, Weijun Wang wrote: > core-libs does not need to care about these security-related modules. Looks good, I guess you can decide if you want to take on Magnus' comment in this PR or leave that for a future improvement. ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/980 From weijun at openjdk.java.net Mon Jan 11 14:42:15 2021 From: weijun at openjdk.java.net (Weijun Wang) Date: Mon, 11 Jan 2021 14:42:15 GMT Subject: RFR: "java.se" matches "java.security.jgss" as well [v2] In-Reply-To: References: Message-ID: > core-libs does not need to care about these security-related modules. Weijun Wang has updated the pull request incrementally with one additional commit since the last revision: more end slash but not java.sql ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/980/files - new: https://git.openjdk.java.net/skara/pull/980/files/441ef963..e1ae8a72 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=980&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=980&range=00-01 Stats: 5 lines in 1 file changed: 0 ins; 0 del; 5 mod Patch: https://git.openjdk.java.net/skara/pull/980.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/980/head:pull/980 PR: https://git.openjdk.java.net/skara/pull/980 From weijun at openjdk.java.net Mon Jan 11 14:42:15 2021 From: weijun at openjdk.java.net (Weijun Wang) Date: Mon, 11 Jan 2021 14:42:15 GMT Subject: RFR: "java.se" matches "java.security.jgss" as well [v2] In-Reply-To: <77WRxKB7IGTUAzHcwv3blF0GmCatj4IkzymzFDtvTYM=.ab9906ac-59dd-40e2-a0d7-bdfd1169458e@github.com> References: <77WRxKB7IGTUAzHcwv3blF0GmCatj4IkzymzFDtvTYM=.ab9906ac-59dd-40e2-a0d7-bdfd1169458e@github.com> Message-ID: <6xzyRQtJ9SFeRDClkZKkNkr0W_AdPx8RGYhjK9TUnlA=.a1f11430-e750-40c9-b198-5380fd9af1d9@github.com> On Mon, 11 Jan 2021 14:10:37 GMT, Robin Westberg wrote: >> Weijun Wang has updated the pull request incrementally with one additional commit since the last revision: >> >> more end slash but not java.sql > > Looks good, I guess you can decide if you want to take on Magnus' comment in this PR or leave that for a future improvement. @magicus @rwestberg Thanks for the comment. I made some other changes but haven't touched `java.sql` that matches both `java.sql` and `java.sql.rowset` which could be intentional. ------------- PR: https://git.openjdk.java.net/skara/pull/980 From ihse at openjdk.java.net Mon Jan 11 18:33:17 2021 From: ihse at openjdk.java.net (Magnus Ihse Bursie) Date: Mon, 11 Jan 2021 18:33:17 GMT Subject: RFR: "java.se" matches "java.security.jgss" as well [v2] In-Reply-To: References: Message-ID: On Mon, 11 Jan 2021 14:42:15 GMT, Weijun Wang wrote: >> core-libs does not need to care about these security-related modules. > > Weijun Wang has updated the pull request incrementally with one additional commit since the last revision: > > more end slash but not java.sql Marked as reviewed by ihse (no project role). ------------- PR: https://git.openjdk.java.net/skara/pull/980 From weijun at openjdk.java.net Tue Jan 12 08:43:33 2021 From: weijun at openjdk.java.net (Weijun Wang) Date: Tue, 12 Jan 2021 08:43:33 GMT Subject: Integrated: "java.se" matches "java.security.jgss" as well In-Reply-To: References: Message-ID: <3gYy0rNHImEkHUclW7X4d1imDeM7LwmSUbiW6kaidik=.918172fc-162b-4e64-8fb9-ff06e43d1b94@github.com> On Tue, 22 Dec 2020 16:31:21 GMT, Weijun Wang wrote: > core-libs does not need to care about these security-related modules. This pull request has now been integrated. Changeset: 8b16dad0 Author: Weijun Wang Committer: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/8b16dad0 Stats: 6 lines in 1 file changed: 0 ins; 0 del; 6 mod "java.se" matches "java.security.jgss" as well Reviewed-by: xuelei, rwestberg, ihse ------------- PR: https://git.openjdk.java.net/skara/pull/980 From ehelin at openjdk.java.net Tue Jan 12 09:15:51 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 12 Jan 2021 09:15:51 GMT Subject: RFR: skara-840 Message-ID: Hi all, please review this patch that ensures that backport pull requests always have a correct title. In other words, don't assume that old(er) commits have correct commit message titles, fetch the data from JBS instead. Testing: - [x] Added a new unit test Thanks, Erik ------------- Commit messages: - skara-840 Changes: https://git.openjdk.java.net/skara/pull/981/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=981&range=00 Stats: 110 lines in 2 files changed: 109 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/981.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/981/head:pull/981 PR: https://git.openjdk.java.net/skara/pull/981 From rwestberg at openjdk.java.net Tue Jan 12 09:32:19 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 12 Jan 2021 09:32:19 GMT Subject: RFR: skara-840 In-Reply-To: References: Message-ID: <8M5rkVMtSNM7IAZkOIa5YPAzSMcWgSE8u9w9kMvn57c=.6a44e043-ed8e-44c3-ab74-e13f003cebb8@github.com> On Tue, 12 Jan 2021 09:12:50 GMT, Erik Helin wrote: > Hi all, > > please review this patch that ensures that backport pull requests always have a correct title. In other words, don't assume that old(er) commits have correct commit message titles, fetch the data from JBS instead. > > Testing: > - [x] Added a new unit test > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/981 From ehelin at openjdk.java.net Tue Jan 12 10:42:09 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 12 Jan 2021 10:42:09 GMT Subject: Integrated: skara-840 In-Reply-To: References: Message-ID: On Tue, 12 Jan 2021 09:12:50 GMT, Erik Helin wrote: > Hi all, > > please review this patch that ensures that backport pull requests always have a correct title. In other words, don't assume that old(er) commits have correct commit message titles, fetch the data from JBS instead. > > Testing: > - [x] Added a new unit test > > Thanks, > Erik This pull request has now been integrated. Changeset: c24e546b Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/c24e546b Stats: 110 lines in 2 files changed: 109 ins; 0 del; 1 mod skara-840 Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/981 From ehelin at openjdk.java.net Tue Jan 12 10:45:12 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 12 Jan 2021 10:45:12 GMT Subject: RFR: 681: No (obvious) way to remove "test-request" label Message-ID: Hi all, please review this patch that removes the `test-request` label from a PR when the a test request is cancelled. Thanks, Erik ------------- Commit messages: - skara-681 Changes: https://git.openjdk.java.net/skara/pull/982/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=982&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-681 Stats: 107 lines in 3 files changed: 107 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/982.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/982/head:pull/982 PR: https://git.openjdk.java.net/skara/pull/982 From rwestberg at openjdk.java.net Tue Jan 12 11:02:45 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 12 Jan 2021 11:02:45 GMT Subject: RFR: 681: No (obvious) way to remove "test-request" label In-Reply-To: References: Message-ID: <4VFVC-Vgk2MuN2c27KTaFuA6aNS9EymIKQ2g3z5Ueoc=.156a48f4-b65a-4cfc-b990-a03c6f266988@github.com> On Tue, 12 Jan 2021 10:42:24 GMT, Erik Helin wrote: > Hi all, > > please review this patch that removes the `test-request` label from a PR when the a test request is cancelled. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/982 From ehelin at openjdk.java.net Tue Jan 12 11:02:49 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 12 Jan 2021 11:02:49 GMT Subject: RFR: mlbridge: use bot email address when auto-closing PRs Message-ID: Hi all, please review this patch that ensures that the bot's email address is used when auto-closing pull requests (not the creator of the pull requests' email). Thanks, Erik ------------- Commit messages: - mlbridge: use bot email address when auto-closing PRs Changes: https://git.openjdk.java.net/skara/pull/983/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=983&range=00 Stats: 60 lines in 8 files changed: 59 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/983.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/983/head:pull/983 PR: https://git.openjdk.java.net/skara/pull/983 From david.holmes at oracle.com Tue Jan 12 11:54:29 2021 From: david.holmes at oracle.com (David Holmes) Date: Tue, 12 Jan 2021 21:54:29 +1000 Subject: Contribution Guide In-Reply-To: <6B667213-6D44-410E-B8F3-398B5D951600@gmail.com> References: <25E5A5C8-6BE9-4233-B4E2-0F94DDE6C6CB@gmail.com> <90b19507-ffaa-67a5-95df-5392ecb1d2ef@oracle.com> <6B667213-6D44-410E-B8F3-398B5D951600@gmail.com> Message-ID: <8eb0fa80-7e72-641d-b131-c5fd34161598@oracle.com> On 11/01/2021 7:16 pm, Sebastian Stenzel wrote: > >> On 10. Jan 2021, at 23:20, David Holmes > > wrote: >> >>> I have submitted the signed OCA on behalf of our organization, but >>> how does it get mapped to my GitHub username? >> >> There's a manual registration step (at Oracle end) that needs to be >> done. If you create the PR it will then give you additional instructions. > > Thanks for your answers, Joe and David. With that I managed to create my > first PR. The one thing that is still unclear to me: Since I signed the > OCA for an organization, it affects not one but many usernames that'll > be changing over time. How does Oracle know what users are included? > > Or is it a manual check each time one writes /covered in a PR? I believe that is the case. David ----- > Btw I attempted to provide additional information with the "/covered" > comment to help Oracle find the right OCA, however the?bridgekeeper bot > didn't seem to like this [1]. Maybe this can be improved? > > [1]: https://github.com/openjdk/jdk/pull/2017#issuecomment-757511633 > From ehelin at openjdk.java.net Tue Jan 12 12:57:27 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 12 Jan 2021 12:57:27 GMT Subject: Integrated: 681: No (obvious) way to remove "test-request" label In-Reply-To: References: Message-ID: On Tue, 12 Jan 2021 10:42:24 GMT, Erik Helin wrote: > Hi all, > > please review this patch that removes the `test-request` label from a PR when the a test request is cancelled. > > Thanks, > Erik This pull request has now been integrated. Changeset: 8f85cb4a Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/8f85cb4a Stats: 107 lines in 3 files changed: 107 ins; 0 del; 0 mod 681: No (obvious) way to remove "test-request" label Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/982 From rwestberg at openjdk.java.net Wed Jan 13 09:48:42 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 13 Jan 2021 09:48:42 GMT Subject: RFR: mlbridge: use bot email address when auto-closing PRs [v2] In-Reply-To: <4muzIMt0V40jDlXr7jaWe2zikELijjZB-VV0aA8K_eU=.168414f7-3d49-4a79-a7c2-5c5491c913fd@github.com> References: <4muzIMt0V40jDlXr7jaWe2zikELijjZB-VV0aA8K_eU=.168414f7-3d49-4a79-a7c2-5c5491c913fd@github.com> Message-ID: On Wed, 13 Jan 2021 09:46:05 GMT, Erik Helin wrote: >> Hi all, >> >> please review this patch that ensures that the bot's email address is used when auto-closing pull requests (not the creator of the pull requests' email). >> >> Thanks, >> Erik > > Erik Helin has updated the pull request incrementally with one additional commit since the last revision: > > Add test, use configured list of bot accounts Looks good, I updated your change a bit with a new test and a different way of determining if the closer was a bot. ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/983 From ehelin at openjdk.java.net Wed Jan 13 09:48:42 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 13 Jan 2021 09:48:42 GMT Subject: RFR: mlbridge: use bot email address when auto-closing PRs [v2] In-Reply-To: References: Message-ID: <4muzIMt0V40jDlXr7jaWe2zikELijjZB-VV0aA8K_eU=.168414f7-3d49-4a79-a7c2-5c5491c913fd@github.com> > Hi all, > > please review this patch that ensures that the bot's email address is used when auto-closing pull requests (not the creator of the pull requests' email). > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Add test, use configured list of bot accounts ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/983/files - new: https://git.openjdk.java.net/skara/pull/983/files/28809154..c82c3f37 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=983&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=983&range=00-01 Stats: 12 lines in 4 files changed: 8 ins; 0 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/983.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/983/head:pull/983 PR: https://git.openjdk.java.net/skara/pull/983 From ehelin at openjdk.java.net Wed Jan 13 09:48:43 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 13 Jan 2021 09:48:43 GMT Subject: RFR: mlbridge: use bot email address when auto-closing PRs [v2] In-Reply-To: References: <4muzIMt0V40jDlXr7jaWe2zikELijjZB-VV0aA8K_eU=.168414f7-3d49-4a79-a7c2-5c5491c913fd@github.com> Message-ID: On Wed, 13 Jan 2021 09:43:09 GMT, Robin Westberg wrote: >> Erik Helin has updated the pull request incrementally with one additional commit since the last revision: >> >> Add test, use configured list of bot accounts > > Looks good, I updated your change a bit with a new test and a different way of determining if the closer was a bot. Thanks @rwestberg, looks great! ------------- PR: https://git.openjdk.java.net/skara/pull/983 From ehelin at openjdk.java.net Wed Jan 13 09:48:43 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 13 Jan 2021 09:48:43 GMT Subject: Integrated: mlbridge: use bot email address when auto-closing PRs In-Reply-To: References: Message-ID: On Tue, 12 Jan 2021 11:00:00 GMT, Erik Helin wrote: > Hi all, > > please review this patch that ensures that the bot's email address is used when auto-closing pull requests (not the creator of the pull requests' email). > > Thanks, > Erik This pull request has now been integrated. Changeset: 5b299d8d Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/5b299d8d Stats: 70 lines in 10 files changed: 67 ins; 0 del; 3 mod mlbridge: use bot email address when auto-closing PRs Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/983 From martin at openjdk.java.net Fri Jan 15 02:35:45 2021 From: martin at openjdk.java.net (Martin Buchholz) Date: Fri, 15 Jan 2021 02:35:45 GMT Subject: RFR: 867: Your git version is: 2.30.0.284...., which is not a known ... Message-ID: 867: Your git version is: 2.30.0.284...., which is not a known ... ------------- Commit messages: - SKARA-867 Changes: https://git.openjdk.java.net/skara/pull/984/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=984&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-867 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/984.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/984/head:pull/984 PR: https://git.openjdk.java.net/skara/pull/984 From rwestberg at openjdk.java.net Fri Jan 15 09:44:21 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 15 Jan 2021 09:44:21 GMT Subject: RFR: 749: If an integration fails at a late stage, it will both say that it succeeded and failed Message-ID: Wait with outputting the success message until after the final push command during `/integrate` or `/sponsor` has actually completed. ------------- Commit messages: - Perform the push before writing the success message Changes: https://git.openjdk.java.net/skara/pull/985/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=985&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-749 Stats: 7 lines in 2 files changed: 4 ins; 3 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/985.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/985/head:pull/985 PR: https://git.openjdk.java.net/skara/pull/985 From ehelin at openjdk.java.net Fri Jan 15 10:08:30 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 15 Jan 2021 10:08:30 GMT Subject: RFR: 749: If an integration fails at a late stage, it will both say that it succeeded and failed In-Reply-To: References: Message-ID: On Fri, 15 Jan 2021 09:41:18 GMT, Robin Westberg wrote: > Wait with outputting the success message until after the final push command during `/integrate` or `/sponsor` has actually completed. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/985 From jvernee at openjdk.java.net Fri Jan 15 13:23:49 2021 From: jvernee at openjdk.java.net (Jorn Vernee) Date: Fri, 15 Jan 2021 13:23:49 GMT Subject: RFR: 867: Your git version is: 2.30.0.284...., which is not a known ... In-Reply-To: References: Message-ID: <6ZRvUbJFc2pKQKK8sl03XLJeIsX4VhoqGvfOlB-A9bA=.1dc34eb3-9c6c-4d90-89d7-b6c6b42f43ea@github.com> On Fri, 15 Jan 2021 02:30:36 GMT, Martin Buchholz wrote: > 867: Your git version is: 2.30.0.284...., which is not a known ... LGTM. If you don't mind, please also add this version string as a test case to GitVersionTest: https://github.com/openjdk/skara/blob/master/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java#L46 ------------- Marked as reviewed by jvernee (Reviewer). PR: https://git.openjdk.java.net/skara/pull/984 From rwestberg at openjdk.java.net Fri Jan 15 13:30:01 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 15 Jan 2021 13:30:01 GMT Subject: Integrated: 749: If an integration fails at a late stage, it will both say that it succeeded and failed In-Reply-To: References: Message-ID: On Fri, 15 Jan 2021 09:41:18 GMT, Robin Westberg wrote: > Wait with outputting the success message until after the final push command during `/integrate` or `/sponsor` has actually completed. This pull request has now been integrated. Changeset: 06e31a80 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/06e31a80 Stats: 7 lines in 2 files changed: 4 ins; 3 del; 0 mod 749: If an integration fails at a late stage, it will both say that it succeeded and failed Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/985 From martin at openjdk.java.net Fri Jan 15 18:41:07 2021 From: martin at openjdk.java.net (Martin Buchholz) Date: Fri, 15 Jan 2021 18:41:07 GMT Subject: RFR: 867: Your git version is: 2.30.0.284...., which is not a known ... In-Reply-To: <6ZRvUbJFc2pKQKK8sl03XLJeIsX4VhoqGvfOlB-A9bA=.1dc34eb3-9c6c-4d90-89d7-b6c6b42f43ea@github.com> References: <6ZRvUbJFc2pKQKK8sl03XLJeIsX4VhoqGvfOlB-A9bA=.1dc34eb3-9c6c-4d90-89d7-b6c6b42f43ea@github.com> Message-ID: <6k-xtNKaL1DAMmFDrcJzUNWGismm4Swa631oUX7SjYo=.c7c3d608-ecde-4d05-8d7a-8f3b6d458c2b@github.com> On Fri, 15 Jan 2021 13:21:31 GMT, Jorn Vernee wrote: >> 867: Your git version is: 2.30.0.284...., which is not a known ... > > LGTM. > > If you don't mind, please also add this version string as a test case to GitVersionTest: https://github.com/openjdk/skara/blob/master/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java#L46 @JornVernee. I made an effort to add some tests. Blind change below. I tried and failed to run the test. Installing junit5 made no difference. README.md wants junit5 5.6.2 but my reasonably up-to-date system has an older version. I tried `sh gradlew reproduce` but it wants docker installed, and I'm reluctant to do that. `make test` produces no output to explain why it apparently didn't even try to compile GitVersionTest. diff --git a/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java b/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java index 8d9f7a58..92755fbd 100644 --- a/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java +++ b/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java @@ -43,7 +43,10 @@ public class GitVersionTest { arguments("git version 2.25.3", 2, 25, 3), arguments("git version 2.26.1", 2, 26, 1), - arguments("git version 2.27.0.windows.1", 2, 27, 0) + arguments("git version 2.27.0.windows.1", 2, 27, 0), + + arguments("git version 2.30.0.284", 2, 30, 0), + arguments("git version 2.30.0.284.cafebabe-yoyodyne", 2, 30, 0) ); } ------------- PR: https://git.openjdk.java.net/skara/pull/984 From jvernee at openjdk.java.net Fri Jan 15 20:41:57 2021 From: jvernee at openjdk.java.net (Jorn Vernee) Date: Fri, 15 Jan 2021 20:41:57 GMT Subject: RFR: 867: Your git version is: 2.30.0.284...., which is not a known ... In-Reply-To: <6k-xtNKaL1DAMmFDrcJzUNWGismm4Swa631oUX7SjYo=.c7c3d608-ecde-4d05-8d7a-8f3b6d458c2b@github.com> References: <6ZRvUbJFc2pKQKK8sl03XLJeIsX4VhoqGvfOlB-A9bA=.1dc34eb3-9c6c-4d90-89d7-b6c6b42f43ea@github.com> <6k-xtNKaL1DAMmFDrcJzUNWGismm4Swa631oUX7SjYo=.c7c3d608-ecde-4d05-8d7a-8f3b6d458c2b@github.com> Message-ID: On Fri, 15 Jan 2021 18:38:51 GMT, Martin Buchholz wrote: >> LGTM. >> >> If you don't mind, please also add this version string as a test case to GitVersionTest: https://github.com/openjdk/skara/blob/master/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java#L46 > > @JornVernee. I made an effort to add some tests. Blind change below. > > I tried and failed to run the test. Installing junit5 made no difference. > README.md wants junit5 5.6.2 but my reasonably up-to-date system has an older version. > I tried `sh gradlew reproduce` but it wants docker installed, and I'm reluctant to do that. > `make test` produces no output to explain why it apparently didn't even try to compile GitVersionTest. > > diff --git a/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java b/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java > index 8d9f7a58..92755fbd 100644 > --- a/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java > +++ b/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java > @@ -43,7 +43,10 @@ public class GitVersionTest { > arguments("git version 2.25.3", 2, 25, 3), > arguments("git version 2.26.1", 2, 26, 1), > > - arguments("git version 2.27.0.windows.1", 2, 27, 0) > + arguments("git version 2.27.0.windows.1", 2, 27, 0), > + > + arguments("git version 2.30.0.284", 2, 30, 0), > + arguments("git version 2.30.0.284.cafebabe-yoyodyne", 2, 30, 0) > ); > } > ``` With that patch GitVersionTest still passes on my machine, so adding that seems good to me. --- FWIW, I'd expect gradle to fetch the right junit dependency for you. Skara is also used as a testing platform for bleeding edge Java tech, so that's why a recent version of junit is being used. You should be able to run `./gradlew :vcs:test` to trigger that particular set of tests to run, and GitVersionTest should be one of the first that runs. When running all the tests it might abort early due to a failure. Using IntelliJ's built-in junit test runner should also work if you're using IntelliJ. Lastly, if you [enable GitHub actions for your fork](https://wiki.openjdk.java.net/display/SKARA/Testing#Testing-Configuringworkflowstorun) some automated testing will also occur when you update the PR (results show at the bottom of the PR's 'Conversation' tab). ------------- PR: https://git.openjdk.java.net/skara/pull/984 From martin at openjdk.java.net Fri Jan 15 23:07:50 2021 From: martin at openjdk.java.net (Martin Buchholz) Date: Fri, 15 Jan 2021 23:07:50 GMT Subject: RFR: 867: Your git version is: 2.30.0.284...., which is not a known ... [v2] In-Reply-To: References: Message-ID: > 867: Your git version is: 2.30.0.284...., which is not a known ... Martin Buchholz has updated the pull request incrementally with one additional commit since the last revision: add tests as suggested by @JornVernee ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/984/files - new: https://git.openjdk.java.net/skara/pull/984/files/a7470502..a83e2533 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=984&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=984&range=00-01 Stats: 6 lines in 1 file changed: 6 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/984.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/984/head:pull/984 PR: https://git.openjdk.java.net/skara/pull/984 From martin at openjdk.java.net Fri Jan 15 23:07:51 2021 From: martin at openjdk.java.net (Martin Buchholz) Date: Fri, 15 Jan 2021 23:07:51 GMT Subject: RFR: 867: Your git version is: 2.30.0.284...., which is not a known ... [v2] In-Reply-To: References: <6ZRvUbJFc2pKQKK8sl03XLJeIsX4VhoqGvfOlB-A9bA=.1dc34eb3-9c6c-4d90-89d7-b6c6b42f43ea@github.com> <6k-xtNKaL1DAMmFDrcJzUNWGismm4Swa631oUX7SjYo=.c7c3d608-ecde-4d05-8d7a-8f3b6d458c2b@github.com> Message-ID: On Fri, 15 Jan 2021 20:39:43 GMT, Jorn Vernee wrote: >> @JornVernee. I made an effort to add some tests. Blind change below. >> >> I tried and failed to run the test. Installing junit5 made no difference. >> README.md wants junit5 5.6.2 but my reasonably up-to-date system has an older version. >> I tried `sh gradlew reproduce` but it wants docker installed, and I'm reluctant to do that. >> `make test` produces no output to explain why it apparently didn't even try to compile GitVersionTest. >> >> diff --git a/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java b/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java >> index 8d9f7a58..92755fbd 100644 >> --- a/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java >> +++ b/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java >> @@ -43,7 +43,10 @@ public class GitVersionTest { >> arguments("git version 2.25.3", 2, 25, 3), >> arguments("git version 2.26.1", 2, 26, 1), >> >> - arguments("git version 2.27.0.windows.1", 2, 27, 0) >> + arguments("git version 2.27.0.windows.1", 2, 27, 0), >> + >> + arguments("git version 2.30.0.284", 2, 30, 0), >> + arguments("git version 2.30.0.284.cafebabe-yoyodyne", 2, 30, 0) >> ); >> } >> ``` > > With that patch GitVersionTest still passes on my machine, so adding that seems good to me. > > --- > > FWIW, I'd expect gradle to fetch the right junit dependency for you. Skara is also used as a testing platform for bleeding edge Java tech, so that's why a recent version of junit is being used. > > You should be able to run `./gradlew :vcs:test` to trigger that particular set of tests to run, and GitVersionTest should be one of the first that runs. When running all the tests it might abort early due to a failure. > > Using IntelliJ's built-in junit test runner should also work if you're using IntelliJ. > > Lastly, if you [enable GitHub actions for your fork](https://wiki.openjdk.java.net/display/SKARA/Testing#Testing-Configuringworkflowstorun) some automated testing will also occur when you update the PR (results show at the bottom of the PR's 'Conversation' tab). I enabled GitHub actions. I had success with `sh gradlew :vcs:test`. I added my pet 'git 10 bug' test. Our git is configured to use `main` not `master` as default branch, causing many tests to fail. Which I ignored. ------------- PR: https://git.openjdk.java.net/skara/pull/984 From jvernee at openjdk.java.net Sat Jan 16 00:09:59 2021 From: jvernee at openjdk.java.net (Jorn Vernee) Date: Sat, 16 Jan 2021 00:09:59 GMT Subject: RFR: 867: Your git version is: 2.30.0.284...., which is not a known ... [v2] In-Reply-To: References: Message-ID: On Fri, 15 Jan 2021 23:07:50 GMT, Martin Buchholz wrote: >> 867: Your git version is: 2.30.0.284...., which is not a known ... > > Martin Buchholz has updated the pull request incrementally with one additional commit since the last revision: > > add tests as suggested by @JornVernee Marked as reviewed by jvernee (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/984 From martin at openjdk.java.net Sun Jan 17 01:58:35 2021 From: martin at openjdk.java.net (Martin Buchholz) Date: Sun, 17 Jan 2021 01:58:35 GMT Subject: Integrated: 867: Your git version is: 2.30.0.284...., which is not a known ... In-Reply-To: References: Message-ID: On Fri, 15 Jan 2021 02:30:36 GMT, Martin Buchholz wrote: > 867: Your git version is: 2.30.0.284...., which is not a known ... This pull request has now been integrated. Changeset: c9727188 Author: Martin Buchholz Committer: Jorn Vernee URL: https://git.openjdk.java.net/skara/commit/c9727188 Stats: 7 lines in 2 files changed: 6 ins; 0 del; 1 mod 867: Your git version is: 2.30.0.284...., which is not a known ... Reviewed-by: jvernee ------------- PR: https://git.openjdk.java.net/skara/pull/984 From christoph.langer at sap.com Mon Jan 18 15:19:02 2021 From: christoph.langer at sap.com (Langer, Christoph) Date: Mon, 18 Jan 2021 15:19:02 +0000 Subject: Backport Experience In-Reply-To: References: Message-ID: Hi, any answers/updates to my questions below? Cheers Christoph From: Langer, Christoph Sent: Freitag, 8. Januar 2021 00:13 To: skara-dev at openjdk.java.net; Erik Helin ; Robin Westberg Subject: Backport Experience Hi Skara Team, I just made my first Skara backport from openjdk to jdk16 [0]. I was following the process described in the Wiki [1]. It seems like there are still some gaps which I?d like to report here. 1. The feature to do a backport by commenting on the original change (which would be very cool and convenient) doesn?t seem to work yet. I commented on the original commit [2] but nothing happened. 2. Then I tried ?git backport? as described in the Wiki - I got: git: 'backport' is not a git command. See 'git --help' (although I ran git skara update before). It seems this is not implemented yet? So, my question would then be: Will this be implemented and if yes, what?s the ETA? ?? Other than that, I?ve got another point which I don?t know whether it can be fixed. In the backport commit on GitHub, one can read: ?Backport-of: 3f9f86f0d3f918b9955ba6ba73c9c58ae8fcf7cb?. It would be cool, if this commit ID could be a link to the original commit. Do you know whether this could be implemented? Otherwise I need to go to the original commit via the indirection of the JBS bug link, which is probably ok-ish, too. Thanks Christoph [0] https://github.com/openjdk/jdk16/pull/95 [1] https://wiki.openjdk.java.net/display/SKARA/Backports [2] https://github.com/openjdk/jdk/commit/3f9f86f0d3f918b9955ba6ba73c9c58ae8fcf7cb#commitcomment-45734116 From erik.helin at oracle.com Wed Jan 20 12:41:25 2021 From: erik.helin at oracle.com (Erik Helin) Date: Wed, 20 Jan 2021 13:41:25 +0100 Subject: Backport Experience Message-ID: <0613d96a-3b71-1b21-6aec-562d806f893a@oracle.com> Hi Christoph, sorry for the late reply, I've had some issues with my e-mail lately. Both features you mention are implemented but not deployed yet. The ETA is to roll this out piece by piece next week. We can't unfortunately make "Backport-of: 3f9f86f0d3f918b9955ba6ba73c9c58ae8fcf7cb", but you can paste that hash into the search field on GitHub to find the original commit. Thanks, Erik From ehelin at openjdk.java.net Wed Jan 20 13:11:05 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 20 Jan 2021 13:11:05 GMT Subject: RFR: backports: handle original commit without issues Message-ID: Hi all, please review this patch that handles backports of commits that are missing proper references to issues in JBS. Testing: - [x] Added a new unit test Thanks, Erik ------------- Commit messages: - backports: handle original commit without issues Changes: https://git.openjdk.java.net/skara/pull/986/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=986&range=00 Stats: 83 lines in 2 files changed: 68 ins; 4 del; 11 mod Patch: https://git.openjdk.java.net/skara/pull/986.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/986/head:pull/986 PR: https://git.openjdk.java.net/skara/pull/986 From ehelin at openjdk.java.net Wed Jan 20 13:27:15 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 20 Jan 2021 13:27:15 GMT Subject: RFR: checkout: refine logging levels Message-ID: Hi all, please review this small patch that refines the logging levels for the `checkout` bot. Thanks, Erik ------------- Commit messages: - checkout: refine logging levels Changes: https://git.openjdk.java.net/skara/pull/987/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=987&range=00 Stats: 14 lines in 3 files changed: 5 ins; 0 del; 9 mod Patch: https://git.openjdk.java.net/skara/pull/987.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/987/head:pull/987 PR: https://git.openjdk.java.net/skara/pull/987 From ehelin at openjdk.java.net Wed Jan 20 13:56:36 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 20 Jan 2021 13:56:36 GMT Subject: RFR: vcs: only convert tags that are part of branch Message-ID: Hi all, please review this patch that ensures that the `GitToHgConverter` only converts tags that are pointing to commits on the branch the converter is converting. Thanks, Erik ------------- Commit messages: - checkout: only convert tags that are part of branch Changes: https://git.openjdk.java.net/skara/pull/988/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=988&range=00 Stats: 7 lines in 1 file changed: 7 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/988.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/988/head:pull/988 PR: https://git.openjdk.java.net/skara/pull/988 From rwestberg at openjdk.java.net Wed Jan 20 15:47:11 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 20 Jan 2021 15:47:11 GMT Subject: RFR: backports: handle original commit without issues In-Reply-To: References: Message-ID: On Wed, 20 Jan 2021 13:07:55 GMT, Erik Helin wrote: > Hi all, > > please review this patch that handles backports of commits that are missing proper references to issues in JBS. > > Testing: > - [x] Added a new unit test > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/986 From rwestberg at openjdk.java.net Wed Jan 20 15:47:48 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 20 Jan 2021 15:47:48 GMT Subject: RFR: checkout: refine logging levels In-Reply-To: References: Message-ID: On Wed, 20 Jan 2021 13:23:57 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that refines the logging levels for the `checkout` bot. > > Thanks, > Erik Looks fine! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/987 From rwestberg at openjdk.java.net Wed Jan 20 15:51:13 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Wed, 20 Jan 2021 15:51:13 GMT Subject: RFR: vcs: only convert tags that are part of branch In-Reply-To: References: Message-ID: On Wed, 20 Jan 2021 13:53:35 GMT, Erik Helin wrote: > Hi all, > > please review this patch that ensures that the `GitToHgConverter` only converts tags that are pointing to commits on the branch the converter is converting. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/988 From ehelin at openjdk.java.net Thu Jan 21 08:46:27 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 21 Jan 2021 08:46:27 GMT Subject: Integrated: checkout: refine logging levels In-Reply-To: References: Message-ID: On Wed, 20 Jan 2021 13:23:57 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that refines the logging levels for the `checkout` bot. > > Thanks, > Erik This pull request has now been integrated. Changeset: 277d620c Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/277d620c Stats: 14 lines in 3 files changed: 5 ins; 0 del; 9 mod checkout: refine logging levels Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/987 From ehelin at openjdk.java.net Thu Jan 21 08:46:41 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 21 Jan 2021 08:46:41 GMT Subject: Integrated: backports: handle original commit without issues In-Reply-To: References: Message-ID: On Wed, 20 Jan 2021 13:07:55 GMT, Erik Helin wrote: > Hi all, > > please review this patch that handles backports of commits that are missing proper references to issues in JBS. > > Testing: > - [x] Added a new unit test > > Thanks, > Erik This pull request has now been integrated. Changeset: cd5442cf Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/cd5442cf Stats: 83 lines in 2 files changed: 68 ins; 4 del; 11 mod backports: handle original commit without issues Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/986 From ehelin at openjdk.java.net Thu Jan 21 08:47:03 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 21 Jan 2021 08:47:03 GMT Subject: Integrated: vcs: only convert tags that are part of branch In-Reply-To: References: Message-ID: On Wed, 20 Jan 2021 13:53:35 GMT, Erik Helin wrote: > Hi all, > > please review this patch that ensures that the `GitToHgConverter` only converts tags that are pointing to commits on the branch the converter is converting. > > Thanks, > Erik This pull request has now been integrated. Changeset: fa6ac0e4 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/fa6ac0e4 Stats: 7 lines in 1 file changed: 7 ins; 0 del; 0 mod vcs: only convert tags that are part of branch Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/988 From ehelin at openjdk.java.net Thu Jan 21 13:21:11 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 21 Jan 2021 13:21:11 GMT Subject: RFR: checkout: simplify conversion logic Message-ID: <6B24flO07pOgOGJ4lsLlBDxk0usDYC_SRRpeh80CGBQ=.c9e53736-7225-4fbd-89d5-389c493c22cb@github.com> Hi all, please review this small patch to simplify the logic for when to update the hosted storage used by the `checkout` bot. Thanks, Erik ------------- Commit messages: - checkout: simplify conversion logic Changes: https://git.openjdk.java.net/skara/pull/990/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=990&range=00 Stats: 15 lines in 2 files changed: 2 ins; 9 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/990.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/990/head:pull/990 PR: https://git.openjdk.java.net/skara/pull/990 From rwestberg at openjdk.java.net Thu Jan 21 13:21:11 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 21 Jan 2021 13:21:11 GMT Subject: RFR: checkout: simplify conversion logic In-Reply-To: <6B24flO07pOgOGJ4lsLlBDxk0usDYC_SRRpeh80CGBQ=.c9e53736-7225-4fbd-89d5-389c493c22cb@github.com> References: <6B24flO07pOgOGJ4lsLlBDxk0usDYC_SRRpeh80CGBQ=.c9e53736-7225-4fbd-89d5-389c493c22cb@github.com> Message-ID: On Thu, 21 Jan 2021 13:16:33 GMT, Erik Helin wrote: > Hi all, > > please review this small patch to simplify the logic for when to update the hosted storage used by the `checkout` bot. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/990 From ehelin at openjdk.java.net Thu Jan 21 13:25:50 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 21 Jan 2021 13:25:50 GMT Subject: Integrated: checkout: simplify conversion logic In-Reply-To: <6B24flO07pOgOGJ4lsLlBDxk0usDYC_SRRpeh80CGBQ=.c9e53736-7225-4fbd-89d5-389c493c22cb@github.com> References: <6B24flO07pOgOGJ4lsLlBDxk0usDYC_SRRpeh80CGBQ=.c9e53736-7225-4fbd-89d5-389c493c22cb@github.com> Message-ID: <-HeARq1ni8vi-v3w1xZ6XpEJZtt0_vCP9bCFNInmtTE=.52ed66d6-8c11-42a3-bb03-a43fcb2b05f7@github.com> On Thu, 21 Jan 2021 13:16:33 GMT, Erik Helin wrote: > Hi all, > > please review this small patch to simplify the logic for when to update the hosted storage used by the `checkout` bot. > > Thanks, > Erik This pull request has now been integrated. Changeset: 9d572d77 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/9d572d77 Stats: 15 lines in 2 files changed: 2 ins; 9 del; 4 mod checkout: simplify conversion logic Reviewed-by: rwestberg ------------- PR: https://git.openjdk.java.net/skara/pull/990 From rwestberg at openjdk.java.net Thu Jan 21 14:15:13 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 21 Jan 2021 14:15:13 GMT Subject: RFR: Add dependency information for initial RFR mail of a dependent PR Message-ID: When sending out an RFR email for a dependent PR, include a line describing the dependency. ------------- Commit messages: - Add dependency information for initial RFR mail of a dependent PR Changes: https://git.openjdk.java.net/skara/pull/991/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=991&range=00 Stats: 100 lines in 2 files changed: 94 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/991.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/991/head:pull/991 PR: https://git.openjdk.java.net/skara/pull/991 From ehelin at openjdk.java.net Thu Jan 21 15:40:13 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 21 Jan 2021 15:40:13 GMT Subject: RFR: Add dependency information for initial RFR mail of a dependent PR In-Reply-To: References: Message-ID: On Thu, 21 Jan 2021 14:11:14 GMT, Robin Westberg wrote: > When sending out an RFR email for a dependent PR, include a line describing the dependency. Looks good! Just a minor nit, I would have used the wording `"Depends on"` instead of `"Depends on PR"` :smiling_face_with_three_hearts: bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveMessages.java line 264: > 262: > 263: var dependsPr = pr.repository().pullRequest(dependsId.get()); > 264: return Optional.of("Depends on PR: " + dependsPr.webUrl()); Suggestion: return Optional.of("Depends on: " + dependsPr.webUrl()); bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java line 3277: > 3275: > 3276: assertTrue(archiveContains(archiveFolder.path(), "Depends on PR:", pr.id())); > 3277: assertFalse(archiveContains(archiveFolder.path(), "Depends on PR:", depPr.id())); Suggestion: assertTrue(archiveContains(archiveFolder.path(), "Depends on:", pr.id())); assertFalse(archiveContains(archiveFolder.path(), "Depends on:", depPr.id())); ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/991 From rwestberg at openjdk.java.net Fri Jan 22 08:11:05 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 22 Jan 2021 08:11:05 GMT Subject: RFR: Add dependency information for initial RFR mail of a dependent PR [v2] In-Reply-To: References: Message-ID: > When sending out an RFR email for a dependent PR, include a line describing the dependency. Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Apply suggestions from code review Co-authored-by: Erik Duveblad ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/991/files - new: https://git.openjdk.java.net/skara/pull/991/files/4e92b67c..bad057aa Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=991&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=991&range=00-01 Stats: 3 lines in 2 files changed: 0 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/991.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/991/head:pull/991 PR: https://git.openjdk.java.net/skara/pull/991 From rwestberg at openjdk.java.net Fri Jan 22 08:11:05 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 22 Jan 2021 08:11:05 GMT Subject: RFR: Add dependency information for initial RFR mail of a dependent PR [v2] In-Reply-To: References: Message-ID: <0gsNSo_WuYo1qYD2GKp2WjsaA_sd8TcxQYERcJbQGLI=.11d02d8c-a9cf-4fa7-9e60-97a89814d6a9@github.com> On Thu, 21 Jan 2021 14:41:05 GMT, Erik Helin wrote: >> Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: >> >> Apply suggestions from code review >> >> Co-authored-by: Erik Duveblad > > Looks good! Just a minor nit, I would have used the wording `"Depends on"` instead of `"Depends on PR"` :smiling_face_with_three_hearts: Sure, why not! ------------- PR: https://git.openjdk.java.net/skara/pull/991 From rwestberg at openjdk.java.net Fri Jan 22 08:37:52 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 22 Jan 2021 08:37:52 GMT Subject: Integrated: Add dependency information for initial RFR mail of a dependent PR In-Reply-To: References: Message-ID: On Thu, 21 Jan 2021 14:11:14 GMT, Robin Westberg wrote: > When sending out an RFR email for a dependent PR, include a line describing the dependency. This pull request has now been integrated. Changeset: fed0751d Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/fed0751d Stats: 100 lines in 2 files changed: 94 ins; 0 del; 6 mod Add dependency information for initial RFR mail of a dependent PR Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/991 From martinrb at google.com Fri Jan 22 20:17:55 2021 From: martinrb at google.com (Martin Buchholz) Date: Fri, 22 Jan 2021 12:17:55 -0800 Subject: RFR: 8252412: [macos11] system dynamic libraries removed from filesystem [v2] In-Reply-To: References: <5u4w-g-wpqqVp3GHPon_vNOhT2Mq0lAowl74fFZwCms=.fc5d8f4c-7e4a-47a4-ad10-02dbe281f16f@github.com> Message-ID: My github comment was mangled forwarding to core-libs. I suspect the skara bidirectional mailing list forwarding bot discards lines with leading "/" . Instead the bot should pass on unrecognized github comment commands unmodified. On Fri, Jan 22, 2021 at 12:12 PM Martin Buchholz wrote: > On Fri, 22 Jan 2021 19:46:13 GMT, Jiangli Zhou > wrote: > > >> Martin Buchholz has refreshed the contents of this pull request, and > previous commits have been removed. The incremental views will show > differences compared to the previous content of the PR. > > > > > src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java > line 132: > > > >> 130: // existence of the containing directory instead of the > file. > >> 131: lib = PCSC_FRAMEWORK; > >> 132: if (new File(lib).getParentFile().isDirectory()) { > > > > This is outside of my normal area, could you please explain why checking > the existence of the containing directory is equivalent to checking the > file here? Does it provide the expected behavior on all unix-like platforms > or only macos? > > > > Could you please also provide a jtreg test for this change? > > The directory structure is intact - only the file is removed from the > filesystem. > More generally, for many frameworks, where there used to be > > > the file is gone, but > > > remains. > > I don't think we need a jtreg test, since any functionality associated > with PCSC is broken on this platform. I added label noreg-other > > ------------- > > PR: https://git.openjdk.java.net/jdk/pull/2119 > From rwestberg at openjdk.java.net Tue Jan 26 08:52:12 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 26 Jan 2021 08:52:12 GMT Subject: RFR: Make the auto labeller less aggressive Message-ID: Only run automatic labeling of PRs once, to avoid interfering with manual decisions. ------------- Commit messages: - Make the auto labeller less aggressive Changes: https://git.openjdk.java.net/skara/pull/992/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=992&range=00 Stats: 225 lines in 4 files changed: 162 ins; 20 del; 43 mod Patch: https://git.openjdk.java.net/skara/pull/992.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/992/head:pull/992 PR: https://git.openjdk.java.net/skara/pull/992 From rwestberg at openjdk.java.net Tue Jan 26 10:37:16 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 26 Jan 2021 10:37:16 GMT Subject: RFR: Add support for setting all labels in a single request Message-ID: Add support for setting all labels of an issue / PR with a single call, and use it for clearing labels on newly created backports. ------------- Commit messages: - Add support for setting all labels in a single request Changes: https://git.openjdk.java.net/skara/pull/993/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=993&range=00 Stats: 56 lines in 7 files changed: 54 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/993.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/993/head:pull/993 PR: https://git.openjdk.java.net/skara/pull/993 From rwestberg at openjdk.java.net Tue Jan 26 12:56:43 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 26 Jan 2021 12:56:43 GMT Subject: RFR: Add support for Jira 8 Message-ID: Use non deprecated method of getting available fields which is available in Jira 8. ------------- Commit messages: - Use non deprecated method of getting available fields for Jira 8 Changes: https://git.openjdk.java.net/skara/pull/994/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=994&range=00 Stats: 60 lines in 1 file changed: 33 ins; 21 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/994.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/994/head:pull/994 PR: https://git.openjdk.java.net/skara/pull/994 From rwestberg at openjdk.java.net Tue Jan 26 13:45:06 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Tue, 26 Jan 2021 13:45:06 GMT Subject: RFR: Make the auto labeller less aggressive [v2] In-Reply-To: References: Message-ID: > Only run automatic labeling of PRs once, to avoid interfering with manual decisions. Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: Fix failing tests ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/992/files - new: https://git.openjdk.java.net/skara/pull/992/files/a03ea195..08056ab4 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=992&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=992&range=00-01 Stats: 2 lines in 1 file changed: 2 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/992.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/992/head:pull/992 PR: https://git.openjdk.java.net/skara/pull/992 From duke at openjdk.java.net Tue Jan 26 14:14:07 2021 From: duke at openjdk.java.net (duke) Date: Tue, 26 Jan 2021 14:14:07 GMT Subject: Withdrawn: pr: show diff of diffs for backports In-Reply-To: References: Message-ID: On Tue, 15 Dec 2020 14:06:16 GMT, Erik Helin wrote: > Hi all, > > please review this patch that shows a "diff of diffs" for backports - i.e. the backport commit will be compared to the original commit and the differences will be shown (for non-clean backports). I also added some unit tests for the new `DiffComparator` utility. > > Thanks, > Erik This pull request has been closed without being integrated. ------------- PR: https://git.openjdk.java.net/skara/pull/973 From ehelin at openjdk.java.net Thu Jan 28 14:04:31 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 28 Jan 2021 14:04:31 GMT Subject: RFR: Add support for Jira 8 In-Reply-To: References: Message-ID: On Tue, 26 Jan 2021 12:53:39 GMT, Robin Westberg wrote: > Use non deprecated method of getting available fields which is available in Jira 8. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/994 From ehelin at openjdk.java.net Thu Jan 28 14:04:49 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 28 Jan 2021 14:04:49 GMT Subject: RFR: Add support for setting all labels in a single request In-Reply-To: References: Message-ID: On Tue, 26 Jan 2021 10:34:12 GMT, Robin Westberg wrote: > Add support for setting all labels of an issue / PR with a single call, and use it for clearing labels on newly created backports. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/993 From ehelin at openjdk.java.net Thu Jan 28 14:05:22 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 28 Jan 2021 14:05:22 GMT Subject: RFR: Make the auto labeller less aggressive [v2] In-Reply-To: References: Message-ID: On Tue, 26 Jan 2021 13:45:06 GMT, Robin Westberg wrote: >> Only run automatic labeling of PRs once, to avoid interfering with manual decisions. > > Robin Westberg has updated the pull request incrementally with one additional commit since the last revision: > > Fix failing tests Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/992 From rwestberg at openjdk.java.net Thu Jan 28 14:48:52 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 28 Jan 2021 14:48:52 GMT Subject: Integrated: Make the auto labeller less aggressive In-Reply-To: References: Message-ID: On Tue, 26 Jan 2021 08:49:07 GMT, Robin Westberg wrote: > Only run automatic labeling of PRs once, to avoid interfering with manual decisions. This pull request has now been integrated. Changeset: 81faf244 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/81faf244 Stats: 223 lines in 4 files changed: 162 ins; 18 del; 43 mod Make the auto labeller less aggressive Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/992 From rwestberg at openjdk.java.net Thu Jan 28 14:49:16 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 28 Jan 2021 14:49:16 GMT Subject: Integrated: Add support for setting all labels in a single request In-Reply-To: References: Message-ID: On Tue, 26 Jan 2021 10:34:12 GMT, Robin Westberg wrote: > Add support for setting all labels of an issue / PR with a single call, and use it for clearing labels on newly created backports. This pull request has now been integrated. Changeset: 53337ece Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/53337ece Stats: 56 lines in 7 files changed: 54 ins; 0 del; 2 mod Add support for setting all labels in a single request Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/993 From rwestberg at openjdk.java.net Thu Jan 28 14:49:56 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Thu, 28 Jan 2021 14:49:56 GMT Subject: Integrated: Add support for Jira 8 In-Reply-To: References: Message-ID: On Tue, 26 Jan 2021 12:53:39 GMT, Robin Westberg wrote: > Use non deprecated method of getting available fields which is available in Jira 8. This pull request has now been integrated. Changeset: c108a455 Author: Robin Westberg URL: https://git.openjdk.java.net/skara/commit/c108a455 Stats: 60 lines in 1 file changed: 33 ins; 21 del; 6 mod Add support for Jira 8 Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/994 From ehelin at openjdk.java.net Fri Jan 29 13:16:40 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 29 Jan 2021 13:16:40 GMT Subject: RFR: checkout: sort marks before converting Message-ID: Hi all, please review this small patch that ensures that we sort the existing marks before passing them to the converter. Thanks, Erik ------------- Commit messages: - checkout: sort marks before converting Changes: https://git.openjdk.java.net/skara/pull/995/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=995&range=00 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/995.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/995/head:pull/995 PR: https://git.openjdk.java.net/skara/pull/995 From rwestberg at openjdk.java.net Fri Jan 29 13:48:59 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Fri, 29 Jan 2021 13:48:59 GMT Subject: RFR: checkout: sort marks before converting In-Reply-To: References: Message-ID: On Fri, 29 Jan 2021 13:13:33 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that ensures that we sort the existing marks before passing them to the converter. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/995 From jvernee at openjdk.java.net Fri Jan 29 14:17:54 2021 From: jvernee at openjdk.java.net (Jorn Vernee) Date: Fri, 29 Jan 2021 14:17:54 GMT Subject: RFR: checkout: sort marks before converting In-Reply-To: References: Message-ID: <0H8hX03nOeZVqc_KGDhRGcuescJX3OadDLDEkFTCzKU=.fdd7611f-a5aa-4e71-acf7-c67adc2341f1@github.com> On Fri, 29 Jan 2021 13:13:33 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that ensures that we sort the existing marks before passing them to the converter. > > Thanks, > Erik One comment, but up to you whether to address bots/checkout/src/main/java/org/openjdk/skara/bots/checkout/CheckoutBot.java line 138: > 136: new IllegalStateException("Repository vanished from " + to)); > 137: var existing = new ArrayList<>(marks.current()); > 138: Collections.sort(existing); If the `convert` method relies on the marks being sorted, maybe it would be more robust to move the call to sort into there? ------------- Marked as reviewed by jvernee (Reviewer). PR: https://git.openjdk.java.net/skara/pull/995 From ehelin at openjdk.java.net Fri Jan 29 14:27:56 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 29 Jan 2021 14:27:56 GMT Subject: RFR: checkout: sort marks before converting In-Reply-To: <0H8hX03nOeZVqc_KGDhRGcuescJX3OadDLDEkFTCzKU=.fdd7611f-a5aa-4e71-acf7-c67adc2341f1@github.com> References: <0H8hX03nOeZVqc_KGDhRGcuescJX3OadDLDEkFTCzKU=.fdd7611f-a5aa-4e71-acf7-c67adc2341f1@github.com> Message-ID: On Fri, 29 Jan 2021 14:14:58 GMT, Jorn Vernee wrote: >> Hi all, >> >> please review this small patch that ensures that we sort the existing marks before passing them to the converter. >> >> Thanks, >> Erik > > bots/checkout/src/main/java/org/openjdk/skara/bots/checkout/CheckoutBot.java line 138: > >> 136: new IllegalStateException("Repository vanished from " + to)); >> 137: var existing = new ArrayList<>(marks.current()); >> 138: Collections.sort(existing); > > If the `convert` method relies on the marks being sorted, maybe it would be more robust to move the call to sort into there? Yeah, I agree. Problem is that the `convert` method takes a `List` (which might be an `UnmodifiableList`), so I can't just pass it to `Collections.sort` ?? I would have to make a copy of the passed list and then sort _that_ list, and that just seems a bit annoying (give that we can have around 100,000 marks). ------------- PR: https://git.openjdk.java.net/skara/pull/995 From ehelin at openjdk.java.net Fri Jan 29 14:27:57 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 29 Jan 2021 14:27:57 GMT Subject: Integrated: checkout: sort marks before converting In-Reply-To: References: Message-ID: <8axPMELHuxmmpkixFLp-Ps4IBcqa_eKsWykuJVhWlMg=.bb8a474e-3d9f-40fa-abd6-62e2de693133@github.com> On Fri, 29 Jan 2021 13:13:33 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that ensures that we sort the existing marks before passing them to the converter. > > Thanks, > Erik This pull request has now been integrated. Changeset: 0a118635 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/0a118635 Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod checkout: sort marks before converting Reviewed-by: rwestberg, jvernee ------------- PR: https://git.openjdk.java.net/skara/pull/995 From kcr at openjdk.java.net Fri Jan 29 22:26:24 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Fri, 29 Jan 2021 22:26:24 GMT Subject: RFR: 880: Map jdk.jpackage to core-libs-dev Message-ID: The `jpackage` tool moved from the `jdk.incubator.jpackage` module to `jdk.jpackage` in JDK 16. The `jdk.json` config file needs to be updated accordingly so that `jpackage` reviews are sent to `core-libs-dev`. ------------- Commit messages: - 880: Map jdk.jpackage to core-libs-dev Changes: https://git.openjdk.java.net/skara/pull/996/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=996&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-880 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/996.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/996/head:pull/996 PR: https://git.openjdk.java.net/skara/pull/996 From kcr at openjdk.java.net Sat Jan 30 14:57:31 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Sat, 30 Jan 2021 14:57:31 GMT Subject: Integrated: 80: Allow valid bug ID format to be configurable Message-ID: JBS issue: https://bugs.openjdk.java.net/browse/SKARA-80 This provides a configuration option to define the pattern for a valid issue ID as follows. This starts with the idea @edvbld mentioned in PR #99, although I felt it was cleaner to leave the default issue format as is, and use the more restrictive pattern for the "legacy" jdk conf file. The syntax of the new pattern is: [checks "issues"] pattern= The default pattern is: [checks "issues"] pattern=^(([A-Z][A-Z0-9]+-)?[0-9]+): (\S.*)$ For legacy JDK `.jcheck/conf` files, the pattern is as follows to match the issue ID rules in `jcheck.py`: [checks "issues"] pattern=^([124-8][0-9]{6}): (\S.*)$ ------------- Commit messages: - Fix typo found during review - 80: Allow valid bug ID format to be configurable Changes: https://git.openjdk.java.net/skara/pull/163/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=163&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-80 Stats: 322 lines in 5 files changed: 315 ins; 1 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/163.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/163/head:pull/163 PR: https://git.openjdk.java.net/skara/pull/163 From rwestberg at openjdk.java.net Sat Jan 30 14:57:32 2021 From: rwestberg at openjdk.java.net (Robin Westberg) Date: Sat, 30 Jan 2021 14:57:32 GMT Subject: Integrated: 80: Allow valid bug ID format to be configurable In-Reply-To: References: Message-ID: On Wed, 25 Sep 2019 13:50:11 GMT, Kevin Rushforth wrote: > JBS issue: https://bugs.openjdk.java.net/browse/SKARA-80 > > This provides a configuration option to define the pattern for a valid issue ID as follows. This starts with the idea @edvbld mentioned in PR #99, although I felt it was cleaner to leave the default issue format as is, and use the more restrictive pattern for the "legacy" jdk conf file. > > The syntax of the new pattern is: > > [checks "issues"] > pattern= > > The default pattern is: > > [checks "issues"] > pattern=^(([A-Z][A-Z0-9]+-)?[0-9]+): (\S.*)$ > > For legacy JDK `.jcheck/conf` files, the pattern is as follows to match the issue ID rules in `jcheck.py`: > > [checks "issues"] > pattern=^([124-8][0-9]{6}): (\S.*)$ Looks good, thanks for fixing this! Noticed a pre-existing typo, could perhaps fix that while we're at it.. jcheck/src/main/java/org/openjdk/skara/jcheck/IssuesCheck.java line 48: > 46: var metadata = CommitIssue.metadata(commit, message, conf, this); > 47: if (commit.message().isEmpty() || message.issues().isEmpty()) { > 48: log.finer("isuse: no reference to a JBS issue"); Suggestion: log.finer("issue: no reference to a JBS issue"); ------------- Marked as reviewed by rwestberg (Reviewer). PR: https://git.openjdk.java.net/skara/pull/163 From kcr at openjdk.java.net Sat Jan 30 14:57:32 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Sat, 30 Jan 2021 14:57:32 GMT Subject: Integrated: 80: Allow valid bug ID format to be configurable In-Reply-To: References: Message-ID: On Thu, 26 Sep 2019 11:54:01 GMT, Robin Westberg wrote: >> JBS issue: https://bugs.openjdk.java.net/browse/SKARA-80 >> >> This provides a configuration option to define the pattern for a valid issue ID as follows. This starts with the idea @edvbld mentioned in PR #99, although I felt it was cleaner to leave the default issue format as is, and use the more restrictive pattern for the "legacy" jdk conf file. >> >> The syntax of the new pattern is: >> >> [checks "issues"] >> pattern= >> >> The default pattern is: >> >> [checks "issues"] >> pattern=^(([A-Z][A-Z0-9]+-)?[0-9]+): (\S.*)$ >> >> For legacy JDK `.jcheck/conf` files, the pattern is as follows to match the issue ID rules in `jcheck.py`: >> >> [checks "issues"] >> pattern=^([124-8][0-9]{6}): (\S.*)$ > > Looks good, thanks for fixing this! Noticed a pre-existing typo, could perhaps fix that while we're at it.. @rwestberg I fixed the typo you pointed out. ------------- PR: https://git.openjdk.java.net/skara/pull/163