matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build] 'make reset' target will continue recursive operations if any fail (#4675)

Browse Source 
This change allows the recursive `git clean` and `git reset` commands to continue even if they encounter an error in one of the submodules. Previously, if an error was encountered, the operation would terminate with a message similar to the following:

Stopping at 'src/sonic-mgmt-framework'; script returned non-zero status.
This commit is contained in:
Joe LeVeque 2020-06-01 13:28:03 -07:00 committed by GitHub
parent ccd08f10dd
commit 336cf2a3c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.work
View File

@ -283,8 +283,8 @@ reset :
fi fi
git clean -xfdf; git clean -xfdf;
git reset --hard; git reset --hard;
git submodule foreach --recursive git clean -xfdf; git submodule foreach --recursive 'git clean -xfdf || true';
git submodule foreach --recursive git reset --hard; git submodule foreach --recursive 'git reset --hard || true';
git submodule update --init --recursive; git submodule update --init --recursive;
echo "Reset complete!"; echo "Reset complete!";
else else