From df4363622b4165e1657c29c86ffacd7c6f8516d0 Mon Sep 17 00:00:00 2001 From: Bruce Collie Date: Fri, 26 Jul 2024 16:42:04 +0100 Subject: [PATCH] Remove references to my contact details from K repo (#4556) This PR removes any final references to my contact details from the K repo, and assigns them to @tothtamas28 instead. --- CODEOWNERS | 4 +- CONTRIBUTING.md | 54 +++---------------- package/debian/kframework-frontend/changelog | 2 +- .../debian/kframework-frontend/control.jammy | 2 +- package/debian/kframework-frontend/copyright | 2 +- 5 files changed, 13 insertions(+), 51 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index d010c0c063e..6cd3356798a 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,3 +1,3 @@ -/k-distribution/include/kframework/builtin/* @dwightguth @ehildenb @Baltoli +/k-distribution/include/kframework/builtin/* @ehildenb @tothtamas28 /.github/workflows/* @runtimeverification/admin -/package/version @dwightguth @ehildenb @rv-jenkins @F-WRunTime @Baltoli +/package/version @ehildenb @rv-jenkins @F-WRunTime @tothtamas28 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ab594d91681..8e9ee176c27 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,14 +53,14 @@ is important that your commits are based on the K `develop` branch. Next, please request a review from a K maintainer on your PR. The last person to modify the files you are changing is a good start, or if you're not sure, -tag [@baltoli][bruce] as a fallback. +tag [@tothtamas28][tamas] as a fallback. -Once your code has been reviewed by a K maintainer, we will open a new PR that -includes your commits with [proper attribution][authors]. Doing so allows us to -run our internal CI processes once we are happy with your code. If the tests -pass, we will merge the PR and close your original PR. If changes need to be -made subsequently to get tests to pass, they will need to be pushed to your -original fork branch. +Once your code has been initially reviewed by a K maintainer, we will approve it +to run against our CI test suite. If the tests pass, we will merge the PR and +close your original PR. If changes need to be made subsequently to get tests to +pass, they will need to be pushed to your original fork branch. For trivial +changes, it can be useful if you permit modifications to be pushed to your +branch by maintainers. ### Licensing @@ -68,47 +68,9 @@ K is licensed under the [BSD 3-Clause License][license]. If you make changes to K via a pull request, your changes will automatically be licensed under the same license following [Github's terms of service][tos]. -### For RV Maintainers - -If you are an RV-internal K developer, please take ownership of any community -pull requests you review, and make sure that they end up getting merged promptly -following these instructions. - -First, review the code in the original PR as you would normally. If you are -happy with the changes made, then create a new branch of your local K repo -referencing the external PR number: -```console -$ git checkout -b adopt-pr-$NUMBER -``` - -Then, add the external user's fork to your local repo as a remote: -```console -$ git remote add temp-k-fork https://github.com/$USER/k.git -$ git fetch temp-k-fork -``` - -You can now cherry-pick the commit range in the user's PR onto your local -branch: -```console -$ git cherry-pick $START..$END -``` - -Finally, push your branch to `runtimeverification/k` and open a PR as usual. CI -should run as expected, and you can request a secondary RV-internal code review -as you would for one of your own PRs. Double-check that the external user is -credited as the commit author in the Github UI. - -If further changes need to be made by the external user, you can cherry-pick -their changes over to your branch as before. - -Once your duplicated PR is merged, you can close (not merge) the user's original -PR and remove your remote pointing to their fork. -```console -$ git remote rm temp-k-fork -``` [authors]: https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors -[bruce]: https://github.com/baltoli +[tamas]: https://github.com/tothtamas28 [discord]: https://discord.com/invite/CurfmXNtbN [fork]: https://docs.github.com/en/get-started/quickstart/fork-a-repo [integration]: https://github.com/runtimeverification/k/tree/master/k-distribution/tests/regression-new diff --git a/package/debian/kframework-frontend/changelog b/package/debian/kframework-frontend/changelog index 32cfbdc0125..8388ce9e1c7 100644 --- a/package/debian/kframework-frontend/changelog +++ b/package/debian/kframework-frontend/changelog @@ -2,4 +2,4 @@ kframework-frontend (7.1.0) unstable; urgency=medium * Initial Release. - -- Bruce Collie Thu, 2 May 2024 10:52:06 +0100 + -- Tamas Toth Thu, 2 May 2024 10:52:06 +0100 diff --git a/package/debian/kframework-frontend/control.jammy b/package/debian/kframework-frontend/control.jammy index 8de3fe4984c..f885518c546 100644 --- a/package/debian/kframework-frontend/control.jammy +++ b/package/debian/kframework-frontend/control.jammy @@ -1,7 +1,7 @@ Source: kframework-frontend Section: devel Priority: optional -Maintainer: Bruce Collie +Maintainer: Tamas Toth Build-Depends: debhelper (>=10) , flex , maven , openjdk-17-jdk , pkg-config , python3 , python3-dev , python3-distutils , python3-pip , zlib1g-dev Standards-Version: 3.9.6 Homepage: https://github.com/runtimeverification/k diff --git a/package/debian/kframework-frontend/copyright b/package/debian/kframework-frontend/copyright index 714614d5a5c..b0cfb4a50fb 100644 --- a/package/debian/kframework-frontend/copyright +++ b/package/debian/kframework-frontend/copyright @@ -1,6 +1,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: kframework-frontend -Upstream-Contact: Bruce Collie +Upstream-Contact: Tamas Toth Source: https://github.com/runtimeverification/k Files: *