Skip to content

Commit 6fb405f

Browse files
committed
Report list of modified upgrade.txt or UPGRADING.md files
Signed-off-by: Daniel Ziegenberg <[email protected]>
1 parent c1677c0 commit 6fb405f

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

remote_branch_checker/remote_branch_checker.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,12 @@ mv ${WORKSPACE}/work/patchset.files.tmp ${WORKSPACE}/work/patchset.files
321321
if [[ ${versionbranch} -ge 405 ]]; then
322322
if grep -q 'UPGRADING.md\|upgrade.txt' ${WORKSPACE}/work/patchset.files; then
323323
echo "Error: The patchset contains changes to upgrade.txt or UPGRADING.md files." | tee -a ${errorfile}
324+
325+
dirtyupgrades="$( grep 'UPGRADING.md\|upgrade.txt' ${WORKSPACE}/work/patchset.files )"
326+
if [[ -n "${dirtyupgrades}" ]]; then
327+
echo "Error: File(s) affected:" | tee -a ${errorfile}
328+
echo "${dirtyupgrades}" | sed "/^${WORKSPACE}//g" | sed 's/^/Error: /' | tee -a ${errorfile}
329+
fi
324330
fi
325331
fi
326332

tests/fixtures/remote_branch_checker/local_ci_fixture_upgrade_txt_for_405.regex

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@
55
condensedresult="smurf,error,1,0:overview,error,1,0
66
<detail name="overview" status="error" numerrors="1" numwarnings="0"/>
77
<message>The patchset contains changes to upgrade.txt or UPGRADING.md files.</message>
8+
<message>File(s) affected:</message>
9+
<message>UPGRADING.md</message>
10+
<message>lib/upgrade.txt</message>
11+
<message>mod/assign/UPGRADING.md</message>
12+
<message>mod/assign/upgrade.txt</message>

0 commit comments

Comments
 (0)