Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
googletest
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
googletest
Commits
c34ecf1f
Unverified
Commit
c34ecf1f
authored
Sep 25, 2018
by
Gennadiy Civil
Committed by
GitHub
Sep 25, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Add clang format check to one of the builds"
parent
0f7f5cd9
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
36 deletions
+1
-36
.travis.yml
.travis.yml
+1
-3
test_format.sh
ci/test_format.sh
+0
-33
No files found.
.travis.yml
View file @
c34ecf1f
...
@@ -18,9 +18,8 @@ matrix:
...
@@ -18,9 +18,8 @@ matrix:
-
os
:
linux
-
os
:
linux
compiler
:
clang
compiler
:
clang
sudo
:
true
sudo
:
true
env
:
TEST_CLANG_FORMAT="yes"
install
:
./ci/install-linux.sh && ./ci/log-config.sh
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
-
os
:
linux
group
:
deprecated-2017Q4
group
:
deprecated-2017Q4
compiler
:
gcc
compiler
:
gcc
...
@@ -67,7 +66,6 @@ addons:
...
@@ -67,7 +66,6 @@ addons:
packages
:
packages
:
-
g++-4.9
-
g++-4.9
-
clang-3.9
-
clang-3.9
-
clang-format-3.9
notifications
:
notifications
:
email
:
false
email
:
false
ci/test_format.sh
deleted
100755 → 0
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
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