mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7512 from dawidd6/review-approved-ci

Browse Source 
pr-automerge: match only approved PRs by default
This commit is contained in:
Dawid Dziurla 2020-05-09 10:56:52 +02:00 committed by GitHub
commit bc4251d1ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/dev-cmd/pr-automerge.rb
View File

@ -16,9 +16,11 @@ module Homebrew
flag "--tap=", flag "--tap=",
description: "Target tap repository (default: `homebrew/core`)." description: "Target tap repository (default: `homebrew/core`)."
flag "--with-label=", flag "--with-label=",
description: "Pull requests must have this label (default: `ready to merge`)." description: "Pull requests must have this label."
comma_array "--without-labels=", comma_array "--without-labels=",
description: "Pull requests must not have these labels (default: `do not merge`, `new formula`)." description: "Pull requests must not have these labels (default: `do not merge`, `new formula`)."
switch "--without-approval",
description: "Pull requests do not require approval to be merged."
switch "--publish", switch "--publish",
description: "Run `brew pr-publish` on matching pull requests." description: "Run `brew pr-publish` on matching pull requests."
switch "--ignore-failures", switch "--ignore-failures",
@ -33,12 +35,13 @@ module Homebrew
pr_automerge_args.parse pr_automerge_args.parse
ENV["HOMEBREW_FORCE_HOMEBREW_ON_LINUX"] = "1" unless OS.mac? ENV["HOMEBREW_FORCE_HOMEBREW_ON_LINUX"] = "1" unless OS.mac?
with_label = Homebrew.args.with_label || "ready to merge"
without_labels = Homebrew.args.without_labels || ["do not merge", "new formula"] without_labels = Homebrew.args.without_labels || ["do not merge", "new formula"]
tap = Tap.fetch(Homebrew.args.tap || CoreTap.instance.name) tap = Tap.fetch(Homebrew.args.tap || CoreTap.instance.name)
query = "is:pr is:open repo:#{tap.full_name} label:\"#{with_label}\"" query = "is:pr is:open repo:#{tap.full_name}"
query += args.ignore_failures? ? " -status:pending" : " status:success" query += Homebrew.args.ignore_failures? ? " -status:pending" : " status:success"
query += " review:approved" unless Homebrew.args.without_approval?
query += " label:\"#{with_label}\"" if Homebrew.args.with_label
without_labels&.each { |label| query += " -label:\"#{label}\"" } without_labels&.each { |label| query += " -label:\"#{label}\"" }
odebug "Searching: #{query}" odebug "Searching: #{query}"

4
docs/Manpage.md
View File

@ -858,9 +858,11 @@ Find pull requests that can be automatically merged using `brew pr-publish`.
* `--tap`: * `--tap`:
Target tap repository (default: `homebrew/core`). Target tap repository (default: `homebrew/core`).
* `--with-label`: * `--with-label`:
Pull requests must have this label (default: `ready to merge`). Pull requests must have this label.
* `--without-labels`: * `--without-labels`:
Pull requests must not have these labels (default: `do not merge`, `new formula`). Pull requests must not have these labels (default: `do not merge`, `new formula`).
* `--without-approval`:
Pull requests do not require approval to be merged.
* `--publish`: * `--publish`:
Run `brew pr-publish` on matching pull requests. Run `brew pr-publish` on matching pull requests.
* `--ignore-failures`: * `--ignore-failures`:

6
manpages/brew.1
View File

@ -1103,13 +1103,17 @@ Target tap repository (default: \fBhomebrew/core\fR)\.
. .
.TP .TP
\fB\-\-with\-label\fR \fB\-\-with\-label\fR
Pull requests must have this label (default: \fBready to merge\fR)\. Pull requests must have this label\.
. .
.TP .TP
\fB\-\-without\-labels\fR \fB\-\-without\-labels\fR
Pull requests must not have these labels (default: \fBdo not merge\fR, \fBnew formula\fR)\. Pull requests must not have these labels (default: \fBdo not merge\fR, \fBnew formula\fR)\.
. .
.TP .TP
\fB\-\-without\-approval\fR
Pull requests do not require approval to be merged\.
.
.TP
\fB\-\-publish\fR \fB\-\-publish\fR
Run \fBbrew pr\-publish\fR on matching pull requests\. Run \fBbrew pr\-publish\fR on matching pull requests\.
. .