Skip to content

Commit 1bdb856

Browse files
committed
Add 3.5 branch to review-tools
Also drop 3.1 from opensslpull as it is EOL. Reviewed-by: Tim Hudson <[email protected]> Reviewed-by: Matt Caswell <[email protected]> (Merged from #223)
1 parent 362e249 commit 1bdb856

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

review-tools/ghmerge

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ WHAT=""
3636
PICK=no
3737
INTERACTIVE=yes
3838
AUTOSQUASH="--autosquash"
39-
REMOTE=""
4039
TARGET=""
4140
BUILD=yes
4241
[ -z ${CC+x} ] && CC="ccache gcc" # opensslbuild will otherwise use "ccache clang-3.6"

review-tools/gitaddrev

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ foreach (@ARGV) {
143143
} elsif (/--fuzz-corpora$/) {
144144
$WHAT = 'fuzz-corpora';
145145
$min_authors = 1;
146+
$min_reviewers = 1;
146147
# openssl/fuzz-corpora is governed by OTC
147148
$min_otc = 0;
148149
$min_omc = 0;

review-tools/opensslpull

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ test -f ./config || {
77
}
88

99
git checkout --quiet openssl-3.0 ; git pull --rebase
10-
git checkout --quiet openssl-3.1 ; git pull --rebase
1110
git checkout --quiet openssl-3.2 ; git pull --rebase
1211
git checkout --quiet openssl-3.3 ; git pull --rebase
1312
git checkout --quiet openssl-3.4 ; git pull --rebase
13+
git checkout --quiet openssl-3.5 ; git pull --rebase
1414
git checkout --quiet master
1515
git rebase -p origin/master
1616

review-tools/pick-to-branch

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ case $b in
6666
*3*4*)
6767
TARGET=openssl-3.4
6868
;;
69+
*3*5*)
70+
TARGET=openssl-3.5
71+
;;
6972
m*)
7073
TARGET=master
7174
;;

0 commit comments

Comments
 (0)