Skip to content

Report list of modified upgrade.txt or UPGRADING.md files #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Report list of modified upgrade.txt or UPGRADING.md files #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fb405f
Report list of modified upgrade.txt or UPGRADING.md files
ziegenberg Feb 7, 2025
9d83306
Accommodate for changes in vendored UPGRADING.md files
ziegenberg Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion remote_branch_checker/remote_branch_checker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,16 @@ sed '/^$/d' ${WORKSPACE}/work/patchset.files > ${WORKSPACE}/work/patchset.files.
mv ${WORKSPACE}/work/patchset.files.tmp ${WORKSPACE}/work/patchset.files

# For 4.5 and up, verify that the we aren't modifying any upgrade.txt or UPGRADING.md files.
# lib/guzzlehttp/guzzle/UPGRADING.md is a false positive. It's a vendored file.
if [[ ${versionbranch} -ge 405 ]]; then
if grep -q 'UPGRADING.md\|upgrade.txt' ${WORKSPACE}/work/patchset.files; then
if sed '/lib\/guzzlehttp\/guzzle\/UPGRADING.md/d' ${WORKSPACE}/work/patchset.files | grep -q 'UPGRADING.md\|upgrade.txt'; then
echo "Error: The patchset contains changes to upgrade.txt or UPGRADING.md files." | tee -a ${errorfile}

dirtyupgrades="$( sed '/lib\/guzzlehttp\/guzzle\/UPGRADING.md/d' ${WORKSPACE}/work/patchset.files | grep 'UPGRADING.md\|upgrade.txt' )"
if [[ -n "${dirtyupgrades}" ]]; then
echo "Error: File(s) affected:" | tee -a ${errorfile}
echo "${dirtyupgrades}" | sed "/^${WORKSPACE}//g" | sed 's/^/Error: /' | tee -a ${errorfile}
fi
fi
fi

Expand Down
5 changes: 5 additions & 0 deletions tests/fixtures/remote_branch_checker/local_ci_fixture_upgrade_txt_for_405.regex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,8 @@
condensedresult="smurf,error,1,0:overview,error,1,0
<detail name="overview" status="error" numerrors="1" numwarnings="0"/>
<message>The patchset contains changes to upgrade.txt or UPGRADING.md files.</message>
<message>File(s) affected:</message>
<message>UPGRADING.md</message>
<message>lib/upgrade.txt</message>
<message>mod/assign/UPGRADING.md</message>
<message>mod/assign/upgrade.txt</message>
Loading