aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorGunnar Andersson <gandersson@genivi.org>2018-06-13 11:18:22 +0200
committerOscar Andreasson <oan@frozentux.net>2018-06-20 09:00:08 +0200
commit9bfd45a0e577cceb616e6c03b6315bb225c4cedf (patch)
treeb62bb60742830df5f39763d893ee0dffd0d4bbe1 /scripts
parent8efbab9130de3fedd62ef5ac6ad6fe138df610d9 (diff)
downloadmeta-ivi-9bfd45a0e577cceb616e6c03b6315bb225c4cedf.tar.gz
meta-ivi-9bfd45a0e577cceb616e6c03b6315bb225c4cedf.tar.bz2
meta-ivi-9bfd45a0e577cceb616e6c03b6315bb225c4cedf.zip
ci-build: Fix the git diff reporting on conf files
There is a git diff performed and stored in a text file. This is to note in build results if there were any local conf changes. It was wrong (based on GDP directory structure) and also syntactically wrong, which caused the command to fail, and through the -e flag consequently a script error exit as well. The script also needs to exit with success if reaching the end (cleanup function might report some other return code) Signed-off-by: Gunnar Andersson <gandersson@genivi.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ci-build.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
index 1cc06ea..a543769 100755
--- a/scripts/ci-build.sh
+++ b/scripts/ci-build.sh
@@ -520,8 +520,6 @@ if [[ "$LAYER_ARCHIVE" == "true" ]]; then
tar cfj staging/meta-layers-snapshot.tar.bz2 meta-* poky renesas* build/conf
fi
-set -e # Back to strict error checking
-
# META-IVI note:
# usually we don't release built (binary) images of baseline -- however to keep
# the script consistent with GDP version of the script (and make releases
@@ -535,8 +533,8 @@ build_info_file=staging/build_info.txt
# Store environment info into log file for future reference
env >$build_info_file
-echo 'For conf , see files *.conf, and any diff below' >>$build_info_file
-git diff build/conf/templates/*.inc >>$build_info_file
+echo 'Note the content of conf files and any local diffs reported below:' >>$build_info_file
+git diff -- build/conf/*.conf build/conf/*.inc >>$build_info_file
# Environment variable moving selected parts from staging/ to release/
if [[ "$CREATE_RELEASE_DIR" == "true" ]]; then
@@ -561,6 +559,6 @@ ls -al staging/ release/
echo
echo "...in release/images/ :"
ls -al release/images/
-set -e
cleanup
+true