Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Travis clang-tidy job #39537

Merged
merged 2 commits into from
Apr 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ branches:
# - CMAKE=1
# - SANITIZE=address
# - LOCALIZE=0
# - A clang-tidy run
# - A clang-tidy run (now switched to GitHub workflow)
# - Tests with important mods enabled (Magiclysm, RL_Classes)
# We try to minimize the number of builds subject to those constraints.

Expand Down Expand Up @@ -117,14 +117,6 @@ jobs:
osx_image: xcode10.1
compiler: clang

- env: CLANG=clang++-8 TILES=1 SOUND=1 CXXFLAGS=-Wno-unused-command-line-argument CMAKE=1 CATA_CLANG_TIDY=plugin
name: "Clang-tidy CMake build with Tiles and Sound"
compiler: clang
addons: &clang8
apt:
packages: ["clang-8", "libclang-8-dev", "llvm-8-dev", "llvm-8-tools", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev", "libpulse-dev", "libpulse0=1:8.0-0ubuntu3.10", "libpulse-mainloop-glib0=1:8.0-0ubuntu3.10"]
sources: [*apt_sources, llvm-toolchain-xenial-8]

# Finally check the compiler variants
- stage: compilers
# GCC 5.4 is default on Xenial
Expand Down
2 changes: 0 additions & 2 deletions build-scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ function run_tests
$WINE "$@" -d yes --use-colour yes --rng-seed time $EXTRA_TEST_OPTS | grep -Ev "^0\.0[0-9]{2} s:"
}

date +%s > build-start-time

# We might need binaries installed via pip, so ensure that our personal bin dir is on the PATH
export PATH=$HOME/.local/bin:$PATH

Expand Down
12 changes: 0 additions & 12 deletions build-scripts/clang-tidy-wrapper.sh
Original file line number Diff line number Diff line change
@@ -1,20 +1,8 @@
#!/bin/bash

# Wrapper script for clang tidy which is a no-op after some time limit to avoid
# hitting the Travis build timeout.

set -eu
set -o pipefail

seconds_since_build_start=$(($(date +%s) - $(cat build-start-time)))
time_limit=$((15*60)) # Stop 15 minutes after build started
printf "%s/%s seconds elapsed\n" "$seconds_since_build_start" "$time_limit"
if [ "$seconds_since_build_start" -gt "$time_limit" ]
then
printf "Skipping clang-tidy %s due to time limit\n" "$*"
exit 0
fi

plugin=build/tools/clang-tidy-plugin/libCataAnalyzerPlugin.so

set -x
Expand Down