ci: Fix gst-indent path

It used to be downloaded into PATH, but we can now instead run it from
git. Also move it to top source dir instead of gstreamer subproject.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/931>
This commit is contained in:
Xavier Claessens 2021-10-05 08:51:08 -04:00 committed by Jordan Petridis
parent bc40073836
commit cf912f6d15
4 changed files with 6 additions and 3 deletions

View file

@ -302,7 +302,7 @@ def get_subprocess_env(options, gst_version):
options.sysroot) options.sysroot)
# gst-indent # gst-indent
prepend_env_var(env, "PATH", os.path.join(SCRIPTDIR, 'gstreamer', 'tools'), prepend_env_var(env, "PATH", os.path.join(SCRIPTDIR, 'scripts'),
options.sysroot) options.sysroot)
# tools: gst-launch-1.0, gst-inspect-1.0 # tools: gst-launch-1.0, gst-inspect-1.0

View file

@ -1,5 +1,8 @@
#!/bin/bash #!/bin/bash
BASEDIR=$(dirname $0)
filter_cmd=("cat") filter_cmd=("cat")
if test -f ".indentignore"; then if test -f ".indentignore"; then
filter_args=() filter_args=()
@ -12,4 +15,4 @@ if test -f ".indentignore"; then
filter_cmd=("grep" "-v" "${filter_args[@]}") filter_cmd=("grep" "-v" "${filter_args[@]}")
fi fi
fi fi
git ls-files "*.c" | "${filter_cmd[@]}" | xargs -d '\n' gst-indent git ls-files "*.c" | "${filter_cmd[@]}" | xargs -d '\n' $BASEDIR/gst-indent

View file

@ -324,7 +324,7 @@ changes selectively via `git add -p`. You can bypass the local indentation
check hook by using `git commit -n`, but it will still be checked again later check hook by using `git commit -n`, but it will still be checked again later
when you submit your changes through GitLab for merging. when you submit your changes through GitLab for merging.
[gst-indent]: https://gitlab.freedesktop.org/gstreamer/gstreamer/tree/master/tools/gst-indent [gst-indent]: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/scripts/gst-indent-all
[create-mr]: https://docs.gitlab.com/ee/gitlab-basics/add-merge-request.html [create-mr]: https://docs.gitlab.com/ee/gitlab-basics/add-merge-request.html
### Writing Good Commit Messages ### Writing Good Commit Messages