remove redundant CI jobs
diff --git a/.clang-format b/.clang-format deleted file mode 100644 index 1b11dc0..0000000 --- a/.clang-format +++ /dev/null
@@ -1,88 +0,0 @@ ---- -# Mapbox.Variant C/C+ style -Language: Cpp -AccessModifierOffset: -2 -AlignAfterOpenBracket: Align -AlignConsecutiveAssignments: false -AlignConsecutiveDeclarations: false -AlignEscapedNewlinesLeft: false -AlignOperands: true -AlignTrailingComments: true -AllowAllParametersOfDeclarationOnNextLine: true -AllowShortBlocksOnASingleLine: false -AllowShortCaseLabelsOnASingleLine: false -AllowShortFunctionsOnASingleLine: All -AllowShortIfStatementsOnASingleLine: true -AllowShortLoopsOnASingleLine: true -AlwaysBreakAfterDefinitionReturnType: None -AlwaysBreakAfterReturnType: None -AlwaysBreakBeforeMultilineStrings: false -AlwaysBreakTemplateDeclarations: true -BinPackArguments: true -BinPackParameters: true -BraceWrapping: - AfterClass: true - AfterControlStatement: true - AfterEnum: true - AfterFunction: true - AfterNamespace: false - AfterObjCDeclaration: true - AfterStruct: true - AfterUnion: true - BeforeCatch: true - BeforeElse: true - IndentBraces: false -BreakBeforeBinaryOperators: None -BreakBeforeBraces: Custom -BreakBeforeTernaryOperators: true -BreakConstructorInitializersBeforeComma: false -ColumnLimit: 0 -CommentPragmas: '^ IWYU pragma:' -ConstructorInitializerAllOnOneLineOrOnePerLine: true -ConstructorInitializerIndentWidth: 4 -ContinuationIndentWidth: 4 -Cpp11BracedListStyle: true -DerivePointerAlignment: false -DisableFormat: false -ExperimentalAutoDetectBinPacking: false -ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] -IncludeCategories: - - Regex: '^"(llvm|llvm-c|clang|clang-c)/' - Priority: 2 - - Regex: '^(<|"(gtest|isl|json)/)' - Priority: 3 - - Regex: '.*' - Priority: 1 -IndentCaseLabels: false -IndentWidth: 4 -IndentWrappedFunctionNames: false -KeepEmptyLinesAtTheStartOfBlocks: true -MacroBlockBegin: '' -MacroBlockEnd: '' -MaxEmptyLinesToKeep: 1 -NamespaceIndentation: None -ObjCBlockIndentWidth: 2 -ObjCSpaceAfterProperty: false -ObjCSpaceBeforeProtocolList: true -PenaltyBreakBeforeFirstCallParameter: 19 -PenaltyBreakComment: 300 -PenaltyBreakFirstLessLess: 120 -PenaltyBreakString: 1000 -PenaltyExcessCharacter: 1000000 -PenaltyReturnTypeOnItsOwnLine: 60 -PointerAlignment: Left -ReflowComments: true -SortIncludes: false -SpaceAfterCStyleCast: false -SpaceBeforeAssignmentOperators: true -SpaceBeforeParens: ControlStatements -SpaceInEmptyParentheses: false -SpacesBeforeTrailingComments: 1 -SpacesInAngles: false -SpacesInContainerLiterals: true -SpacesInCStyleCastParentheses: false -SpacesInParentheses: false -SpacesInSquareBrackets: false -Standard: Cpp11 -TabWidth: 4 -UseTab: Never
diff --git a/.clang-tidy b/.clang-tidy deleted file mode 100644 index 3851ee9..0000000 --- a/.clang-tidy +++ /dev/null
@@ -1,28 +0,0 @@ ---- -Checks: '*,-cert-err58-cpp' -WarningsAsErrors: '*' -HeaderFilterRegex: '\/include\/' -AnalyzeTemporaryDtors: false -CheckOptions: - - key: google-readability-braces-around-statements.ShortStatementLines - value: '1' - - key: google-readability-function-size.StatementThreshold - value: '800' - - key: google-readability-namespace-comments.ShortNamespaceLines - value: '10' - - key: google-readability-namespace-comments.SpacesBeforeComments - value: '2' - - key: modernize-loop-convert.MaxCopySize - value: '16' - - key: modernize-loop-convert.MinConfidence - value: reasonable - - key: modernize-loop-convert.NamingStyle - value: CamelCase - - key: modernize-pass-by-value.IncludeStyle - value: llvm - - key: modernize-replace-auto-ptr.IncludeStyle - value: llvm - - key: modernize-use-nullptr.NullMacros - value: 'NULL' -... -
diff --git a/.travis.yml b/.travis.yml index 1e77f22..5d433d3 100644 --- a/.travis.yml +++ b/.travis.yml
@@ -2,24 +2,6 @@ matrix: include: - # clang-tidy/format specific job - - os: linux - sudo: false - env: CLANG_FORMAT CLANG_TIDY - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'libstdc++6', 'libstdc++-5-dev' ] - script: - - make tidy - - make format - - os: linux - sudo: false - env: CXX=g++-4.9 - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'g++-4.9' ] - os: linux sudo: false env: CXX=g++-5 @@ -41,24 +23,6 @@ apt: sources: [ 'ubuntu-toolchain-r-test' ] packages: [ 'libstdc++6', 'libstdc++-5-dev' ] - # coverage build - - os: linux - sudo: false - env: CXXFLAGS="--coverage" LDFLAGS="--coverage" - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'libstdc++6', 'libstdc++-5-dev' ] - script: - - make debug - - make test - # MASON_LLVM_RELEASE comes from the setup.sh script - - mason install llvm-cov ${MASON_LLVM_RELEASE} - - mason link llvm-cov ${MASON_LLVM_RELEASE} - - curl -S -f https://codecov.io/bash -o codecov - - chmod +x codecov - - ./codecov -x "llvm-cov gcov" -Z - env: global: - CMAKE_VERSION="3.8.2"
diff --git a/scripts/clang-tidy.sh b/scripts/clang-tidy.sh deleted file mode 100755 index b3a76ad..0000000 --- a/scripts/clang-tidy.sh +++ /dev/null
@@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -set -eu -set -o pipefail - -# https://clang.llvm.org/extra/clang-tidy/ - -# to speed up re-runs, only re-create environment if needed -if [[ ! -f local.env ]]; then - # automatically setup environment - ./scripts/setup.sh --config local.env -fi - -# source the environment -source local.env - -PATH_TO_CLANG_TIDY_SCRIPT="$(pwd)/mason_packages/.link/share/run-clang-tidy.py" - -# to speed up re-runs, only install clang-tidy if needed -if [[ ! -f PATH_TO_CLANG_TIDY_SCRIPT ]]; then - # The MASON_LLVM_RELEASE variable comes from `local.env` - mason install clang-tidy ${MASON_LLVM_RELEASE} - # We link the tools to make it easy to know ${PATH_TO_CLANG_TIDY_SCRIPT} - mason link clang-tidy ${MASON_LLVM_RELEASE} -fi - -# build the compile_commands.json file if it does not exist -if [[ ! -f cmake-build/compile_commands.json ]]; then - # the build automatically puts the compile commands in the ./build directory - make - -fi - -# change into the build directory so that clang-tidy can find the files -# at the right paths (since this is where the actual build happens) -cd cmake-build -${PATH_TO_CLANG_TIDY_SCRIPT} -fix -
diff --git a/scripts/coverage.sh b/scripts/coverage.sh deleted file mode 100755 index 2cfc9c9..0000000 --- a/scripts/coverage.sh +++ /dev/null
@@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -set -eu -set -o pipefail - -# http://clang.llvm.org/docs/UsersManual.html#profiling-with-instrumentation -# https://www.bignerdranch.com/blog/weve-got-you-covered/ - -# automatically setup environment - -./scripts/setup.sh --config local.env -source local.env - -make clean -export CXXFLAGS="-fprofile-instr-generate -fcoverage-mapping" -export LDFLAGS="-fprofile-instr-generate" -mason install llvm-cov ${MASON_LLVM_RELEASE} -mason link llvm-cov ${MASON_LLVM_RELEASE} -make debug -rm -f *profraw -rm -f *gcov -rm -f *profdata -LLVM_PROFILE_FILE="code-%p.profraw" make test -CXX_MODULE="./cmake-build/unit-tests" -llvm-profdata merge -output=code.profdata code-*.profraw -llvm-cov report ${CXX_MODULE} -instr-profile=code.profdata -use-color -llvm-cov show ${CXX_MODULE} -instr-profile=code.profdata src/*.cpp -filename-equivalence -use-color -llvm-cov show ${CXX_MODULE} -instr-profile=code.profdata src/*.cpp -filename-equivalence -use-color --format html > /tmp/coverage.html -echo "open /tmp/coverage.html for HTML version of this report"
diff --git a/scripts/format.sh b/scripts/format.sh deleted file mode 100755 index e2e5165..0000000 --- a/scripts/format.sh +++ /dev/null
@@ -1,36 +0,0 @@ -#!/usr/bin/env bash - -set -eu -set -o pipefail - -: ' - -Runs clang-format on the code in include/ - -Return `1` if there are files to be formatted, and automatically formats them. - -Returns `0` if everything looks properly formatted. - -' - # Set up the environment by installing mason and clang++ -./scripts/setup.sh --config local.env -source local.env - -# Add clang-format as a dep -mason install clang-format ${MASON_LLVM_RELEASE} -mason link clang-format ${MASON_LLVM_RELEASE} - -# Run clang-format on all cpp and hpp files in the /src directory -find include/ bench/ test/ -type f -name '*.hpp' -or -name '*.cpp' \ - | xargs -I{} clang-format -i -style=file {} - -# Print list of modified files -dirty=$(git ls-files --modified include/ bench/ test/) - -if [[ $dirty ]]; then - echo "The following files have been modified:" - echo $dirty - exit 1 -else - exit 0 -fi \ No newline at end of file