Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
argo
aml
Commits
81d33817
Commit
81d33817
authored
Apr 23, 2020
by
Swann Perarnau
Browse files
Merge branch 'clang-format-ci-check' into 'staging'
[ci/fix] quiet git-clang-format to avoid errors See merge request
!131
parents
50d67716
e91710c5
Pipeline
#10247
passed with stages
in 3 minutes and 20 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
81d33817
...
...
@@ -35,9 +35,9 @@ clang-format:
script
:
-
rm -f clang-format-diff
-
target=$(git rev-parse $DEFAULT_MERGE_TARGET)
-
nix-shell "$ARGOPKGS" -A ci.aml-format --run "git-clang-format --diff $target > clang-format-diff"
-
nix-shell "$ARGOPKGS" -A ci.aml-format --run "git-clang-format
--quiet
--diff $target > clang-format-diff"
-
lint=$(grep -v --color=never "no modified files to format" clang-format-diff ||
true
)
-
if [ ! -z "$lint" ]; then exit 1; else exit 0; fi
-
if [ ! -z "$lint" ]; then
echo "format errors, inspect the clang-format-diff artifact for info";
exit 1; else exit 0; fi
artifacts
:
when
:
on_failure
paths
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment