Skip to content

Commit c6ab968

Browse files
committed
drop --ignore-milestones and --ignore-labels
They sounded like a useful thing to have but we never used them, bit of cleanup, bye. Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
1 parent 5b77727 commit c6ab968

2 files changed

Lines changed: 0 additions & 36 deletions

File tree

index.html.post

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
</table>
22

3-
<p>Ignored milestones: <b>IGNORED_MILESTONES</b>, ignored labels: <b>IGNORED_LABELS</b></p>
43
<p>Release phase: <b>RELEASE_PHASE</b></p>
54

65
<p><input type="checkbox" id="autoRefreshCheckbox" onclick="refreshSave()"/><span>Refresh automatically</span></p>

merge_list.py

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -372,10 +372,6 @@ def parse_args(argv):
372372
help="Target Github organisation")
373373
parser.add_argument("-r", "--repo", default="zephyr",
374374
help="Target Github repository")
375-
parser.add_argument("-i", "--ignore-milestones", default="",
376-
help="Comma separated list of milestones to ignore")
377-
parser.add_argument("-l", "--ignore-labels", default="",
378-
help="Comma separated list of labels to ignore")
379375
parser.add_argument("--self", default=None, help="Self repository path")
380376

381377
return parser.parse_args(argv)
@@ -468,18 +464,6 @@ def main(argv):
468464

469465
pr_data = {}
470466

471-
if args.ignore_milestones:
472-
ignore_milestones = args.ignore_milestones.split(",")
473-
print(f"ignored milestones: {ignore_milestones}")
474-
else:
475-
ignore_milestones = []
476-
477-
if args.ignore_labels:
478-
ignore_labels = args.ignore_labels.split(",")
479-
print(f"ignored labels: {ignore_labels}")
480-
else:
481-
ignore_labels = []
482-
483467
repo = gh.get_repo(f"{args.org}/{args.repo}")
484468
freeze_mode, latest_tag = detect_feature_freeze_tag(repo)
485469
print(f"Latest tag: {latest_tag}, freeze mode: {freeze_mode}")
@@ -499,23 +483,10 @@ def main(argv):
499483
number = pr_raw["number"]
500484
milestone = pr_raw["milestone"]
501485

502-
if milestone and milestone["title"] in ignore_milestones:
503-
print(f"ignoring: {number} milestone={milestone['title']}")
504-
continue
505-
506486
if freeze_mode and milestone and milestone["title"] > latest_tag:
507487
print(f"ignoring: {number} milestone={milestone['title']} > {latest_tag}")
508488
continue
509489

510-
skip = False
511-
for label in pr_raw["labels"]["nodes"]:
512-
if label["name"] in ignore_labels:
513-
print(f"ignoring: {number} label={label['name']}")
514-
skip = True
515-
break
516-
if skip:
517-
continue
518-
519490
print(f"fetch: {number}")
520491
pr = repo.get_pull(number)
521492

@@ -554,12 +525,6 @@ def main(argv):
554525
html_out = html_out.replace("UPDATE_TIMESTAMP", timestamp)
555526
html_out = html_out.replace("CI_STATUS", ci_status)
556527

557-
milestones_text = ", ".join(ignore_milestones) if ignore_milestones else "none"
558-
html_out = html_out.replace("IGNORED_MILESTONES", milestones_text)
559-
560-
labels_text = ", ".join(ignore_labels) if ignore_labels else "none"
561-
html_out = html_out.replace("IGNORED_LABELS", labels_text)
562-
563528
if freeze_mode:
564529
phase_text = f"feature freeze (next: {latest_tag})"
565530
else:

0 commit comments

Comments
 (0)