Skip to content
This repository was archived by the owner on Jul 31, 2023. It is now read-only.

Commit 4974537

Browse files
authored
Travis: upgrade the OS image from trusty to xenial. (#438)
* Use release binary of buildifier instead of building from source. * Upgrade to clang-format 7.
1 parent 2d0ed08 commit 4974537

File tree

4 files changed

+7
-14
lines changed

4 files changed

+7
-14
lines changed

.travis.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,16 @@ compiler: clang
44
matrix:
55
include:
66
- os: linux
7-
dist: trusty
8-
sudo: false
97
name: "check format"
108
script: tools/travis/check_format.sh
119
- os: linux
12-
dist: trusty
13-
sudo: false
1410
env: BAZEL_OS=linux
1511
script: tools/travis/build_bazel.sh
1612
- os: linux
17-
dist: trusty
18-
sudo: false
1913
compiler: gcc
2014
env: BAZEL_OS=linux
2115
script: tools/travis/build_bazel.sh
2216
- os: linux
23-
dist: trusty
24-
sudo: false
2517
env: CMAKE_OS=linux
2618
script: tools/travis/build_cmake.sh
2719
- os: osx

opencensus/trace/internal/grpc_trace_bin_fuzzer.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
using ::opencensus::trace::SpanContext;
2020
using ::opencensus::trace::propagation::FromGrpcTraceBinHeader;
21-
using ::opencensus::trace::propagation::ToGrpcTraceBinHeader;
2221
using ::opencensus::trace::propagation::kGrpcTraceBinHeaderLen;
22+
using ::opencensus::trace::propagation::ToGrpcTraceBinHeader;
2323

2424
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
2525
absl::string_view header(reinterpret_cast<const char *>(Data), Size);

tools/format.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ fi
5959
if [[ "$tools_check" == "y" ]]; then
6060
# For easier debugging: print the version because it affects the formatting.
6161
CMD=clang-format
62+
if which clang-format-7 >/dev/null; then
63+
CMD=clang-format-7
64+
fi
6265
$CMD -version
6366
$CMD -i -style=Google \
6467
$($FIND -name '*.cc' -print -o -name '*.h' -print)

tools/travis/check_format.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@
1515
set -e
1616
set -x
1717

18-
# Install buildifier if it's not present. It needs at least go 1.8.
19-
if ! which buildifier >/dev/null; then
20-
eval "$(gimme 1.11)"
21-
go get -v github.com/bazelbuild/buildtools/buildifier
22-
fi
18+
# Install buildifier.
19+
wget -O $HOME/bin/buildifier https://github.com/bazelbuild/buildtools/releases/download/2.2.1/buildifier
20+
chmod +x $HOME/bin/buildifier
2321
# Install cmake-format.
2422
pip install --user 'cmake_format>=0.5.2'
2523
# Check format.

0 commit comments

Comments
 (0)