scripts: remove github-merge.py #16625

pull fanquake wants to merge 1 commits into bitcoin:master from fanquake:remove_github_merge_script changing 4 files +3 −476

fanquake commented at 12:24 AM on August 16, 2019: member

This script has been moved to the bitcoin-core/bitcoin-maintainer-tools repository, after discussion in a core dev meeting. The rationale being that it is also useful to other projects, and thus should be moved to a more general repository.

Meeting log: http://www.erisian.com.au/bitcoin-core-dev/log-2019-08-15.html See also: https://github.com/bitcoin-core/bitcoin-maintainer-tools/pull/28

~~I'll open a follow up PR to port the documentation to the maintainer tools repo.~~ Ported the docs in https://github.com/bitcoin-core/bitcoin-maintainer-tools/pull/29
fanquake added the label Scripts and tools on Aug 16, 2019
fanquake force-pushed on Aug 16, 2019
Sjors commented at 8:28 AM on August 16, 2019: member

Concept ACK. Also, I can't verify what script a maintainer runs anyway, can only verify the result. So imo it doesn't matter where this script lives.
emilengler commented at 1:55 PM on August 16, 2019: contributor

You should link to the new script in the other repository, for transparency.
in contrib/devtools/README.md:92 in a83f66942c outdated
```
  88 | @@ -89,66 +89,6 @@ example:
  89 |  BUILDDIR=$PWD/build contrib/devtools/gen-manpages.sh
  90 |  ```
  91 |  
  92 | -github-merge.py
```
laanwj commented at 9:08 AM on August 19, 2019:

Let's add this documentation to the maintainer tools repo too so it doesn't get lost.

fanquake commented at 9:17 AM on August 19, 2019:

I've got https://github.com/bitcoin-core/bitcoin-maintainer-tools/pull/29 open to do just that 👍
in contrib/README.md:6 in a83f66942c outdated
```
   2 | @@ -3,10 +3,9 @@ Repository Tools
   3 |  
   4 |  ### [Developer tools](/contrib/devtools) ###
   5 |  Specific tools for developers working on this repository.
   6 | -Contains the script `github-merge.py` for merging GitHub pull requests securely and signing them using GPG.
```
laanwj commented at 9:10 AM on August 19, 2019:

Might make sense to mention the maintainer-tools repository (here, or somewhere else in a README), and that most developer tools live there.

fanquake commented at 9:17 AM on August 19, 2019:

Agree, will update with a reference to the maintainer tools repo.

fanquake commented at 11:19 AM on August 19, 2019:

Updated with a link to the maintainer-tools repository.

scripts: remove github-merge.py

This script has been moved to the bitcoin-core/bitcoin-maintainer-tools repository,
after discussion in a core dev meeting. The rationale being that it is also useful to
other projects, and thus should be moved to a more general repository.

Meeting log: http://www.erisian.com.au/bitcoin-core-dev/log-2019-08-15.html
See also: https://github.com/bitcoin-core/bitcoin-maintainer-tools/pull/28

6c27fa0f09

fanquake force-pushed on Aug 19, 2019
laanwj commented at 12:04 PM on August 19, 2019: member

ACK 6c27fa0f09e5ec3854f30673d26c6e5e2d27063e
laanwj referenced this in commit c79bf32774 on Aug 19, 2019
laanwj merged this on Aug 19, 2019
DrahtBot added the label Needs rebase on Aug 19, 2019
DrahtBot commented at 1:54 PM on August 19, 2019: member

Needs rebase

in contrib/README.md:9 in 6c27fa0f09

   2 | @@ -3,10 +3,10 @@ Repository Tools
   3 |  
   4 |  ### [Developer tools](/contrib/devtools) ###
   5 |  Specific tools for developers working on this repository.
   6 | -Contains the script `github-merge.py` for merging GitHub pull requests securely and signing them using GPG.
   7 | +Additional tools, including the `github-merge.py` script, are available in the [maintainer-tools](https://github.com/bitcoin-core/bitcoin-maintainer-tools) repository.
   8 |  
   9 |  ### [Verify-Commits](/contrib/verify-commits) ###
  10 | -Tool to verify that every merge commit was signed by a developer using the above `github-merge.py` script.
  11 | +Tool to verify that every merge commit was signed by a developer using the `github-merge.py` script.

jnewbery commented at 2:06 PM on August 19, 2019:

nit: s/signed by a developer/signed by a maintainer/

jnewbery commented at 2:06 PM on August 19, 2019: member

one nit inline. Otherwise looks good.
MarcoFalke closed this on Aug 19, 2019
sidhujag referenced this in commit e23abc759b on Aug 19, 2019
fanquake removed the label Needs rebase on Aug 20, 2019
fanquake deleted the branch on Aug 20, 2019
MarcoFalke locked this on Dec 16, 2021

Contributors

Labels