diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2017-10-17 14:06:58 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-10-18 10:28:08 +0200 |
| commit | 445a8798fd9ab9e0602f6792ec7e384a15dbdd79 (patch) | |
| tree | 049a21dc062ad88bfa61ebf5c653e2bc9e337846 /scripts | |
| parent | 7cebd1f5f3fa13fe6faa022fc45b2670010b8248 (diff) | |
Release notes: correctly strip out none, n/a, no
The previous regex was only matching lines and was not even correctly
doing so. We no match everything that is starting with none, n/a or
no as a sentence or as a full line. We also match empty string and
'.' as a full line.
RELNOTES: .
RELNOTES: None.
RELNOTES: No.
Change-Id: I6e85627170ce35e652c90a37e735b7db93c88b4e
PiperOrigin-RevId: 172452278
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/release/relnotes.sh | 2 | ||||
| -rwxr-xr-x | scripts/release/relnotes_test.sh | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/scripts/release/relnotes.sh b/scripts/release/relnotes.sh index 8c342b2ddd..94edb04c2c 100755 --- a/scripts/release/relnotes.sh +++ b/scripts/release/relnotes.sh @@ -88,7 +88,7 @@ function extract_release_note() { if [[ "$relnote" =~ $regex ]]; then local relnote_kind=${BASH_REMATCH[2]} local relnote_text="${BASH_REMATCH[3]}" - if [[ ! "$(echo $relnote_text | awk '{print tolower($0)}')" =~ ^(none|n/a|no[ \.])?.?$ ]]; then + if [[ ! "$(echo $relnote_text | awk '{print tolower($0)}')" =~ ^((none|n/a|no)(\.( .*)?)?|\.)$ ]]; then eval "RELNOTES_${relnote_kind}+=(\"\${relnote_text}\")" fi fi diff --git a/scripts/release/relnotes_test.sh b/scripts/release/relnotes_test.sh index 66adf700e5..22fbb1382a 100755 --- a/scripts/release/relnotes_test.sh +++ b/scripts/release/relnotes_test.sh @@ -251,4 +251,17 @@ a9c46e5907be66248b6218ae70e0a1d999c696d5 assert_equals "${expected}" "${actual}" } +function test_nonone_relnotes() { + git checkout -q 2ea4fa26281175c316651ec50784b820a9f409cf + local expected='Incompatible changes: + + - --javabase=<absolute path> and --host_javabase=<absolute path> + are not supported anymore. If you need this functionality + java_runtime_suite(name="suite", default=":runtime") + java_runtime(name="runtime", java_home=<path to the JDK>) is an + alternative.' + local actual="$(release_notes 7c605cf6ea9755a06e5abb16a631faac8ebe2937)" + assert_equals "${expected}" "${actual}" +} + run_suite "Release notes generation tests" |