Merge pull request #707 from mithro/diff-fix

infra: Fix the diff output.

.github/kokoro/continuous-db-artix7.cfg

@@ -9,6 +9,7 @@ action {
     # File types
     regex: "**/diff.html"
     regex: "**/diff.json"
+    regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
     # Whole directories

.github/kokoro/continuous-db-kintex7.cfg

@@ -9,6 +9,7 @@ action {
     # File types
     regex: "**/diff.html"
     regex: "**/diff.json"
+    regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
     # Whole directories

.github/kokoro/continuous-db-zynq7.cfg

@@ -9,6 +9,7 @@ action {
     # File types
     regex: "**/diff.html"
     regex: "**/diff.json"
+    regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
     # Whole directories

.github/kokoro/db-full.sh

@@ -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 \
+		--irreversible-delete --find-renames --find-copies --ignore-all-space origin/master
-		|| true
 
 	# Programmatic JSON version
 	diff2html --file diff.json --format json \
 		-- \
-		--irreversible-delete --find-renames --find-copies --ignore-all-space \
+		--irreversible-delete --find-renames --find-copies --ignore-all-space origin/master
-		|| true
 )
 echo "----------------------------------------"
 

.github/kokoro/kokoro-cfg.py

@@ -12,6 +12,7 @@ action {
     # File types
     regex: "**/diff.html"
     regex: "**/diff.json"
+    regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
     # Whole directories

.github/kokoro/presubmit-db-artix7.cfg

@@ -9,6 +9,7 @@ action {
     # File types
     regex: "**/diff.html"
     regex: "**/diff.json"
+    regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
     # Whole directories

.github/kokoro/presubmit-db-kintex7.cfg

@@ -9,6 +9,7 @@ action {
     # File types
     regex: "**/diff.html"
     regex: "**/diff.json"
+    regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
     # Whole directories

.github/kokoro/presubmit-db-zynq7.cfg

@@ -9,6 +9,7 @@ action {
     # File types
     regex: "**/diff.html"
     regex: "**/diff.json"
+    regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
     # Whole directories