ci: ShellCheck preprocessed scripts separately
Change the shellcheck job so that we configure the build and check the preprocessed versions of the scripts, not the bare ones, which might not be syntactically valid yet.
This commit is contained in:
parent
99cf172bc7
commit
43db03909b
|
@ -458,8 +458,15 @@ shellcheck:
|
|||
extends:
|
||||
- .build_on_fedora
|
||||
stage: analysis
|
||||
variables:
|
||||
MESON_OPTIONS: >-
|
||||
-Dpipewire-v4l2=enabled
|
||||
-Dpipewire-jack=enabled
|
||||
script:
|
||||
- shellcheck $(git grep -l "#\!/.*bin/.*sh")
|
||||
- echo "Configuring with meson options $MESON_OPTIONS"
|
||||
- meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS
|
||||
- shellcheck $(git ls-files '*.sh')
|
||||
- shellcheck $(grep -rl "#\!/.*bin/.*sh" "$BUILD_DIR")
|
||||
|
||||
spellcheck:
|
||||
extends:
|
||||
|
|
|
@ -11,6 +11,7 @@ FILENAME="$1"
|
|||
# Add \ingroup commands for the file, for each \addgroup in it
|
||||
BASEFILE=$(echo "$FILENAME" | sed -e 's@.*src/pipewire/@pipewire/@; s@.*spa/include/spa/@spa/@; s@.*src/test/@test/@;')
|
||||
|
||||
# shellcheck disable=SC2028 # \file is not an escape sequence
|
||||
echo "/** \file"
|
||||
echo "\`$BASEFILE\`"
|
||||
sed -n -e '/.*\\addtogroup [a-zA-Z0-9_].*/ { s/.*addtogroup /\\ingroup /; p; }' < "$FILENAME" | sort | uniq
|
||||
|
|
|
@ -52,6 +52,8 @@ if [ -n "$PERIOD" ]; then
|
|||
fi
|
||||
export PIPEWIRE_QUANTUM
|
||||
fi
|
||||
|
||||
# shellcheck disable=SC2016 # ${LIB} is interpreted by ld.so, not the shell
|
||||
LD_LIBRARY_PATH='@LIBJACK_PATH@'"${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}"
|
||||
export LD_LIBRARY_PATH
|
||||
|
||||
|
|
|
@ -37,6 +37,7 @@ shift $(( OPTIND - 1 ))
|
|||
if [ "$PW_UNINSTALLED" = 1 ] ; then
|
||||
PW_V4L2_LD_PRELOAD="$PW_BUILDDIR"'/pipewire-v4l2/src/libpw-v4l2.so'
|
||||
else
|
||||
# shellcheck disable=SC2016 # ${LIB} is interpreted by ld.so, not the shell
|
||||
PW_V4L2_LD_PRELOAD='@LIBV4L2_PATH@/libpw-v4l2.so'
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in New Issue