Skip to content

Fix automator script failing on exit code of 1 from grep #3440

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

Merged
istio-testing merged 1 commit into from
Jul 14, 2021
Merged

Fix automator script failing on exit code of 1 from grep #3440

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions tools/automator/automator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,9 @@ merge() {
# in the git_exclude list. If no files remain after exclusion, the automation script exits.
validate_changes_exist_in_latest_commit() {
if [ -n "$git_exclude" ]; then
set +e # grep will have an exit code of 1 if all files are excluded causing the script to fail
changes=$(git show --name-only --pretty=oneline | sed 1d | grep -cvE "$git_exclude") # need to remove first line
set -e
if [ "${changes}" -eq 0 ]
then
print_error_and_exit "No changes remaining in upstream PR after excluding" 0 # not really an error so return 0
Expand Down