You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2017/11/02 23:11:10 UTC
[1/2] mesos git commit: Bumped 'mesos-tidy' image to 'mesos_50'.
Repository: mesos
Updated Branches:
refs/heads/master ea2a6c2f6 -> 057290d55
Bumped 'mesos-tidy' image to 'mesos_50'.
This patch bumps the 'mesos-tidy' image to a clang-5.0-based branch.
Review: https://reviews.apache.org/r/62844/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a5591123
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a5591123
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a5591123
Branch: refs/heads/master
Commit: a559112370a4498a8f53d0fdd054d8c4216931f1
Parents: ea2a6c2
Author: Benjamin Bannier <bb...@apache.org>
Authored: Thu Nov 2 08:19:47 2017 -0700
Committer: Michael Park <mp...@apache.org>
Committed: Thu Nov 2 15:56:26 2017 -0700
----------------------------------------------------------------------
support/mesos-tidy/Dockerfile | 6 +++---
support/mesos-tidy/README.md | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a5591123/support/mesos-tidy/Dockerfile
----------------------------------------------------------------------
diff --git a/support/mesos-tidy/Dockerfile b/support/mesos-tidy/Dockerfile
index 61455eb..f046a14 100644
--- a/support/mesos-tidy/Dockerfile
+++ b/support/mesos-tidy/Dockerfile
@@ -38,9 +38,9 @@ RUN curl -sSL https://cmake.org/files/v3.8/cmake-3.8.2-Linux-x86_64.sh \
sh /tmp/install-cmake.sh --skip-license --prefix=/usr/local
RUN \
- git clone --depth 1 -b release_39 http://llvm.org/git/llvm /tmp/llvm && \
- git clone --depth 1 -b mesos_39 http://github.com/mesos/clang.git /tmp/llvm/tools/clang && \
- git clone --depth 1 -b mesos_39 http://github.com/mesos/clang-tools-extra.git /tmp/llvm/tools/clang/tools/extra && \
+ git clone --depth 1 -b release_50 http://llvm.org/git/llvm /tmp/llvm && \
+ git clone --depth 1 -b mesos_50 http://github.com/mesos/clang.git /tmp/llvm/tools/clang && \
+ git clone --depth 1 -b mesos_50 http://github.com/mesos/clang-tools-extra.git /tmp/llvm/tools/clang/tools/extra && \
\
cmake /tmp/llvm -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt && \
cmake --build tools/clang/lib/Headers --target install -- -j $(nproc) && \
http://git-wip-us.apache.org/repos/asf/mesos/blob/a5591123/support/mesos-tidy/README.md
----------------------------------------------------------------------
diff --git a/support/mesos-tidy/README.md b/support/mesos-tidy/README.md
index 81c0a5c..bfa4273 100644
--- a/support/mesos-tidy/README.md
+++ b/support/mesos-tidy/README.md
@@ -47,4 +47,4 @@ Optionally, the set of checks to perform can be specified in a
Results from 3rdparty external dependencies are filtered from the result set.
-[custom-clang-tidy]: https://github.com/mesos/clang-tools-extra/tree/mesos_39
+[custom-clang-tidy]: https://github.com/mesos/clang-tools-extra/tree/mesos_50
[2/2] mesos git commit: Added building the `stout-tests` target to
`mesos-tidy`.
Posted by mp...@apache.org.
Added building the `stout-tests` target to `mesos-tidy`.
This patch adds `stout-tests` as a build target for `mesos-tidy`
in order to force the generation of `protobuf-tests.pb.h`.
Review: https://reviews.apache.org/r/63520
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/057290d5
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/057290d5
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/057290d5
Branch: refs/heads/master
Commit: 057290d5513cfb5d39a2cc407617b9d477c35a06
Parents: a559112
Author: Michael Park <mp...@apache.org>
Authored: Thu Nov 2 05:04:42 2017 -0700
Committer: Michael Park <mp...@apache.org>
Committed: Thu Nov 2 15:58:52 2017 -0700
----------------------------------------------------------------------
support/mesos-tidy/entrypoint.sh | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/057290d5/support/mesos-tidy/entrypoint.sh
----------------------------------------------------------------------
diff --git a/support/mesos-tidy/entrypoint.sh b/support/mesos-tidy/entrypoint.sh
index adb554f..bdaa453 100755
--- a/support/mesos-tidy/entrypoint.sh
+++ b/support/mesos-tidy/entrypoint.sh
@@ -30,6 +30,11 @@ cmake -DCMAKE_BUILD_TYPE=Release \
${CMAKE_ARGS} \
"${SRCDIR}"
+# We build `stout-tests` here as a build target in order to force
+# the generation of `protobuf-tests.pb.h`. This is pretty hacky
+# for what we want to do, but it's okay for now.
+cmake --build 3rdparty/stout/tests --target stout-tests -- -j $(nproc)
+
# Build the external dependencies.
# TODO(mpark): Use an external dependencies target once MESOS-6924 is resolved.
cmake --build 3rdparty --target boost-1.53.0 -- -j $(nproc)