From ece76a174969f5df41b9d57cf509aa0a1ac0862a Mon Sep 17 00:00:00 2001 From: Derek Argueta Date: Tue, 26 Nov 2019 03:13:27 -0600 Subject: [PATCH 1/5] ci: fix clang-tidy Signed-off-by: Derek Argueta --- ci/run_clang_tidy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/run_clang_tidy.sh b/ci/run_clang_tidy.sh index 94169f036ed48..d7b06b5e58f4f 100755 --- a/ci/run_clang_tidy.sh +++ b/ci/run_clang_tidy.sh @@ -70,7 +70,7 @@ elif [[ "${BUILD_REASON}" != "PullRequest" ]]; then else echo "Running clang-tidy-diff against master branch..." git fetch https://github.com/envoyproxy/envoy.git master - git diff "${SYSTEM_PULLREQUEST_TARGETBRANCH:-refs/heads/master}..HEAD" | filter_excludes | \ + git diff "$(git merge-base HEAD FETCH_HEAD)..HEAD" | filter_excludes | \ "${LLVM_PREFIX}/share/clang/clang-tidy-diff.py" \ -clang-tidy-binary=${CLANG_TIDY} \ -p 1 From c5699e6c1f7c4ba924f03f9bedaf524239c7f477 Mon Sep 17 00:00:00 2001 From: Derek Argueta Date: Tue, 26 Nov 2019 03:27:59 -0600 Subject: [PATCH 2/5] add -o pipefail to avoid masking failures in piped commands Signed-off-by: Derek Argueta --- ci/run_clang_tidy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/run_clang_tidy.sh b/ci/run_clang_tidy.sh index d7b06b5e58f4f..6a39250c92123 100755 --- a/ci/run_clang_tidy.sh +++ b/ci/run_clang_tidy.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eo pipefail ENVOY_SRCDIR=${ENVOY_SRCDIR:-$(cd $(dirname $0)/.. && pwd)} From cedeed81d9393db0c8a8197c6f78eb759e4ec830 Mon Sep 17 00:00:00 2001 From: Derek Argueta Date: Tue, 26 Nov 2019 03:30:25 -0600 Subject: [PATCH 3/5] also remove env variable parameter for docker Signed-off-by: Derek Argueta --- ci/run_envoy_docker.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/run_envoy_docker.sh b/ci/run_envoy_docker.sh index f255826f8bc49..a2eed32a5c34f 100755 --- a/ci/run_envoy_docker.sh +++ b/ci/run_envoy_docker.sh @@ -28,7 +28,6 @@ docker run --rm ${DOCKER_TTY_OPTION} -e HTTP_PROXY=${http_proxy} -e HTTPS_PROXY= -u "${USER}":"${USER_GROUP}" -v "${ENVOY_DOCKER_BUILD_DIR}":/build -v /var/run/docker.sock:/var/run/docker.sock ${GIT_VOLUME_OPTION} \ -e BAZEL_BUILD_EXTRA_OPTIONS -e BAZEL_EXTRA_TEST_OPTIONS -e BAZEL_REMOTE_CACHE -e ENVOY_STDLIB -e BUILD_REASON \ -e BAZEL_REMOTE_INSTANCE -e GCP_SERVICE_ACCOUNT_KEY -e NUM_CPUS -e ENVOY_RBE -e FUZZIT_API_KEY -e ENVOY_BUILD_IMAGE \ - -e SYSTEM_PULLREQUEST_TARGETBRANCH \ -v "$PWD":/source --cap-add SYS_PTRACE --cap-add NET_RAW --cap-add NET_ADMIN "${ENVOY_BUILD_IMAGE}" \ /bin/bash -lc "groupadd --gid $(id -g) -f envoygroup && useradd -o --uid $(id -u) --gid $(id -g) --no-create-home \ --home-dir /source envoybuild && usermod -a -G pcap envoybuild && su envoybuild -c \"cd source && $*\"" From e8d52a927f614fdf2fb8a17fa82063ea6a468aae Mon Sep 17 00:00:00 2001 From: Derek Argueta Date: Tue, 26 Nov 2019 22:13:37 -0600 Subject: [PATCH 4/5] update git diff command Signed-off-by: Derek Argueta --- ci/run_clang_tidy.sh | 2 +- ci/run_envoy_docker.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/run_clang_tidy.sh b/ci/run_clang_tidy.sh index 6a39250c92123..59f3333fbed7f 100755 --- a/ci/run_clang_tidy.sh +++ b/ci/run_clang_tidy.sh @@ -70,7 +70,7 @@ elif [[ "${BUILD_REASON}" != "PullRequest" ]]; then else echo "Running clang-tidy-diff against master branch..." git fetch https://github.com/envoyproxy/envoy.git master - git diff "$(git merge-base HEAD FETCH_HEAD)..HEAD" | filter_excludes | \ + git diff "${SYSTEM_PULLREQUEST_TARGETBRANCH}" | filter_excludes | \ "${LLVM_PREFIX}/share/clang/clang-tidy-diff.py" \ -clang-tidy-binary=${CLANG_TIDY} \ -p 1 diff --git a/ci/run_envoy_docker.sh b/ci/run_envoy_docker.sh index a2eed32a5c34f..f255826f8bc49 100755 --- a/ci/run_envoy_docker.sh +++ b/ci/run_envoy_docker.sh @@ -28,6 +28,7 @@ docker run --rm ${DOCKER_TTY_OPTION} -e HTTP_PROXY=${http_proxy} -e HTTPS_PROXY= -u "${USER}":"${USER_GROUP}" -v "${ENVOY_DOCKER_BUILD_DIR}":/build -v /var/run/docker.sock:/var/run/docker.sock ${GIT_VOLUME_OPTION} \ -e BAZEL_BUILD_EXTRA_OPTIONS -e BAZEL_EXTRA_TEST_OPTIONS -e BAZEL_REMOTE_CACHE -e ENVOY_STDLIB -e BUILD_REASON \ -e BAZEL_REMOTE_INSTANCE -e GCP_SERVICE_ACCOUNT_KEY -e NUM_CPUS -e ENVOY_RBE -e FUZZIT_API_KEY -e ENVOY_BUILD_IMAGE \ + -e SYSTEM_PULLREQUEST_TARGETBRANCH \ -v "$PWD":/source --cap-add SYS_PTRACE --cap-add NET_RAW --cap-add NET_ADMIN "${ENVOY_BUILD_IMAGE}" \ /bin/bash -lc "groupadd --gid $(id -g) -f envoygroup && useradd -o --uid $(id -u) --gid $(id -g) --no-create-home \ --home-dir /source envoybuild && usermod -a -G pcap envoybuild && su envoybuild -c \"cd source && $*\"" From a905f7c334f729629f42410c0b53c6d6a0be6e54 Mon Sep 17 00:00:00 2001 From: Derek Argueta Date: Wed, 27 Nov 2019 01:53:42 -0600 Subject: [PATCH 5/5] review Signed-off-by: Derek Argueta --- ci/run_clang_tidy.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/run_clang_tidy.sh b/ci/run_clang_tidy.sh index 59f3333fbed7f..11d98e4c0096c 100755 --- a/ci/run_clang_tidy.sh +++ b/ci/run_clang_tidy.sh @@ -69,8 +69,7 @@ elif [[ "${BUILD_REASON}" != "PullRequest" ]]; then -p 1 else echo "Running clang-tidy-diff against master branch..." - git fetch https://github.com/envoyproxy/envoy.git master - git diff "${SYSTEM_PULLREQUEST_TARGETBRANCH}" | filter_excludes | \ + git diff "remotes/origin/${SYSTEM_PULLREQUEST_TARGETBRANCH}" | filter_excludes | \ "${LLVM_PREFIX}/share/clang/clang-tidy-diff.py" \ -clang-tidy-binary=${CLANG_TIDY} \ -p 1