luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

infra: Fix the diff output. 

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
This commit is contained in:
Tim 'mithro' Ansell 2019-03-11 11:40:10 -07:00
parent 484eae2bb7
commit c9853fbba1
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/kokoro/db-full.sh vendored
View File

@ -107,14 +107,14 @@ echo "----------------------------------------"
echo "----------------------------------------"
echo " Database Diff Summary"
echo "----------------------------------------"
git diff --stat --irreversible-delete --find-renames --find-copies --ignore-all-space
git diff --stat --irreversible-delete --find-renames --find-copies --ignore-all-space origin/master
# Output the actually diff
echo
echo "----------------------------------------"
echo " Database Diff"
echo "----------------------------------------"
git diff --color --irreversible-delete --find-renames --find-copies --ignore-all-space
git diff --color --irreversible-delete --find-renames --find-copies --ignore-all-space origin/master
# Save the diff to be uploaded as an artifact
echo
@ -123,20 +123,18 @@ echo "----------------------------------------"
echo "----------------------------------------"
# Patch file
git diff \
--color --irreversible-delete --find-renames --find-copies --ignore-all-space \
--color --irreversible-delete --find-renames --find-copies --ignore-all-space origin/master \
> diff.patch
# Pretty HTML file version
diff2html --summary=open --file diff.html --format html \
-- \
--irreversible-delete --find-renames --find-copies --ignore-all-space \
|| true
--irreversible-delete --find-renames --find-copies --ignore-all-space origin/master
# Programmatic JSON version
diff2html --file diff.json --format json \
-- \
--irreversible-delete --find-renames --find-copies --ignore-all-space \
|| true
--irreversible-delete --find-renames --find-copies --ignore-all-space origin/master
)
echo "----------------------------------------"