Skip to content

Commit e119093

Browse files
nhormant8m
authored andcommitted
add support for installer repo to ghmerge
Adds installer repo as a merge WHAT target Reviewed-by: Richard Levitte <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from #194)
1 parent a60da29 commit e119093

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

review-tools/addrev

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ foreach (@ARGV) {
4242
$args .= "--fuzz-corpora ";
4343
} elsif (/^--perftools$/) {
4444
$args .= "--perftools ";
45+
} elsif (/^--installer/) {
46+
$args .= "--installer ";
4547
} elsif (/^--verbose$/) {
4648
$args .= "--verbose ";
4749
} elsif (/^--noself$/) {

review-tools/ghmerge

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Option style arguments:
99
1010
--help Print this help and exit
1111
--tools Merge a tools PR (rather than openssl PR)
12+
--installer Merge an installer PR (rather than openssl PR)
1213
--web Merge a web PR (rather than openssl PR)
1314
--perftools Merge a perftools PR (rather than openssl PR)
1415
--fuzz-corpora Merge a PR against fuzz-corpora (rather than openssl PR)
@@ -63,6 +64,8 @@ while [ $# -ne 0 ]; do
6364
;;
6465
--perftools)
6566
WHAT=perftools; BUILD=no; shift
67+
--installer)
68+
WHAT=installer ; BUILD=no ; shift
6669
;;
6770
--technical-policies)
6871
WHAT=technical-policies ; BUILD=no ; shift

review-tools/gitaddrev

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,15 @@ foreach (@ARGV) {
148148
$min_omc = 0;
149149
} elsif (/--perftools$/) {
150150
$WHAT = 'perftools';
151-
$min_authors = 2;
151+
$min_authors = 1;
152152
$min_otc = 0;
153153
$min_omc = 0;
154+
} elsif (/--installer$/) {
155+
$WHAT = 'installer';
156+
$min_authors = 1;
157+
# openssl/installer is governed by OTC
158+
$min_otc = 1;
159+
$min_omc = 0;
154160
} elsif (/^--release$/) {
155161
$release = 1;
156162
}

0 commit comments

Comments
 (0)