Skip to content
Snippets Groups Projects
Commit 97f80752 authored by David Gilbert's avatar David Gilbert :bug:
Browse files

Merge branch 'dev/5.3' of...

parents 57dfa008 00ad2027
No related branches found
No related tags found
2 merge requests!90Draft: Forward propagate dev/5.3 changes into 5.4,!85UE5.3-2023.1-rc3
Pipeline #399851 passed
......@@ -51,7 +51,7 @@ stages:
- deploy
clang-format:
image: registry.git-ce.rwth-aachen.de/vr-vis/vr-group/unreal-development/plugins/rwth-vr-toolkit/alpine-analyze:latest
image: registry.git-ce.rwth-aachen.de/vr-vis/vr-group/alpine-analyze:latest
tags:
- docker-executor
- linux
......@@ -69,7 +69,7 @@ clang-format:
- echo $CI_MERGE_REQUEST_DIFF_BASE_SHA
- linter_errors=$(unbuffer git-clang-format --commit "$CI_MERGE_REQUEST_DIFF_BASE_SHA" *.h *.cpp -q --diff | grep -v --color=always "no modified files to format" || true)
- echo "$linter_errors"
- if [ ! -z "$linter_errors" ]; then echo "Detected formatting issues; please fix"; exit 1; else echo "Formatting is correct"; exit 0; fi
- if [ ! -z "$linter_errors" ]; then echo "Detected formatting issues; please fix. Make sure you are using the same clang-format version! You can download it from the development section in this repo's wiki."; exit 1; else echo "Formatting is correct"; exit 0; fi
Generate_Project:
rules:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment