summaryrefslogtreecommitdiff
path: root/tcwg_kernel-build.sh
diff options
context:
space:
mode:
authorDavid Spickett <david.spickett@linaro.org>2020-04-23 11:10:08 +0100
committerDavid Spickett <david.spickett@linaro.org>2020-04-28 13:13:46 +0000
commit6273fc478b9c95c4ae8d42c9021f9428b1d43811 (patch)
tree9564b82cc9e90dc4886835d30cbdea35453b1f53 /tcwg_kernel-build.sh
parent0ce72e970e6cbb6c39469b503cdf65510f4f99d8 (diff)
Shellcheck fixes round 3
Now using the version that's present in the bionic images. Meaning we have more warnings but can also set the minimum level to ignore a lot of them. Fix the check for whether shellcheck supports --severity. (we have pipefail on, but we expect shellcheck to fail in this case) Change-Id: I296b8554591b7d327c75393e3924184abc6512b7
Diffstat (limited to 'tcwg_kernel-build.sh')
-rwxr-xr-xtcwg_kernel-build.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/tcwg_kernel-build.sh b/tcwg_kernel-build.sh
index f6d5aea7..14c24489 100755
--- a/tcwg_kernel-build.sh
+++ b/tcwg_kernel-build.sh
@@ -3,7 +3,9 @@
set -euf -o pipefail
scripts=$(dirname $0)
+# shellcheck source=jenkins-helpers.sh
. $scripts/jenkins-helpers.sh
+# shellcheck source=round-robin.sh
. $scripts/round-robin.sh
convert_args_to_variables "$@"
@@ -137,8 +139,8 @@ build_linux_1 ()
# Otherwise the compiler is new in every build and we would
# only clobber ccache volume.
local ccache=""
- if [ x"${rr[mode]}" != x"jenkins-full" \
- -a x"$(print_single_updated_component)" = x"linux" ]; then
+ if [ x"${rr[mode]}" != x"jenkins-full" ] && \
+ [ x"$(print_single_updated_component)" = x"linux" ]; then
ccache="ccache"
fi
cat > "$(pwd)"/bin/${rr[target]}-cc <<EOF