Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Googletest
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to JiHu GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Meng
Googletest
Commits
c34ecf1f
Unverified
Commit
c34ecf1f
authored
6 years ago
by
Gennadiy Civil
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Revert "Add clang format check to one of the builds"
parent
0f7f5cd9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.travis.yml
+1
-3
1 addition, 3 deletions
.travis.yml
ci/test_format.sh
+0
-33
0 additions, 33 deletions
ci/test_format.sh
with
1 addition
and
36 deletions
.travis.yml
+
1
−
3
View file @
c34ecf1f
...
...
@@ -18,9 +18,8 @@ matrix:
-
os
:
linux
compiler
:
clang
sudo
:
true
env
:
TEST_CLANG_FORMAT="yes"
install
:
./ci/install-linux.sh && ./ci/log-config.sh
script
:
./ci/test_format.sh &&
./ci/build-linux-bazel.sh
script
:
./ci/build-linux-bazel.sh
-
os
:
linux
group
:
deprecated-2017Q4
compiler
:
gcc
...
...
@@ -67,7 +66,6 @@ addons:
packages
:
-
g++-4.9
-
clang-3.9
-
clang-format-3.9
notifications
:
email
:
false
This diff is collapsed.
Click to expand it.
ci/test_format.sh
deleted
100755 → 0
+
0
−
33
View file @
0f7f5cd9
#!/bin/bash
echo
"clang-format - checking Code Formatting..."
if
[[
"
${
TRAVIS_OS_NAME
}
"
==
"linux"
]]
&&
\
[[
"
${
TEST_CLANG_FORMAT
}
"
==
"yes"
]]
;
then
RETURN
=
0
CLANG_FORMAT
=
"clang-format-3.9"
which clang-format-3.9
if
[
!
-f
".clang-format"
]
;
then
echo
".clang-format file not found!"
exit
1
fi
FILES
=
`
git diff master
--name-only
|
grep
-E
"
\.
(cc|cpp|h)$"
`
for
FILE
in
$FILES
;
do
$CLANG_FORMAT
$FILE
| cmp
$FILE
>
/dev/null
if
[
$?
-ne
0
]
;
then
echo
"[!] Clang-Format Found INCORRECT FORMATTING. Please re-format and re-submit. The following file failed:
$FILE
"
>
&2
RETURN
=
1
fi
done
exit
$RETURN
fi
exit
0
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment