From ee1631e5606902beca511529375bfbc0af7e3eb3 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Thu, 1 Oct 2020 17:58:27 +0100 Subject: [PATCH 1/4] shellcheck: upgrade cleanups Signed-off-by: Ryan Northey --- ci/windows_ci_steps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/windows_ci_steps.sh b/ci/windows_ci_steps.sh index f3fb04f263e2..b6008fee888f 100755 --- a/ci/windows_ci_steps.sh +++ b/ci/windows_ci_steps.sh @@ -40,9 +40,9 @@ fi # Environment setup. export TEST_TMPDIR=${BUILD_DIR}/tmp -[[ "${BUILD_REASON}" != "PullRequest" ]] && BAZEL_EXTRA_TEST_OPTIONS+=--nocache_test_results +[[ "${BUILD_REASON}" != "PullRequest" ]] && BAZEL_EXTRA_TEST_OPTIONS+=(--nocache_test_results) -BAZEL_STARTUP_OPTIONS+=--output_base=c:/_eb +BAZEL_STARTUP_OPTIONS+=("--output_base=c:/_eb") BAZEL_BUILD_OPTIONS=( -c opt --show_task_finish From 8c6b6ea46bbb3893456ce6e5995e41489af9b049 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Thu, 1 Oct 2020 18:00:24 +0100 Subject: [PATCH 2/4] use -f diff with shellcheck Signed-off-by: Ryan Northey --- tools/code_format/check_shellcheck_format.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/code_format/check_shellcheck_format.sh b/tools/code_format/check_shellcheck_format.sh index fa62b3dc4695..3edab648625f 100755 --- a/tools/code_format/check_shellcheck_format.sh +++ b/tools/code_format/check_shellcheck_format.sh @@ -19,8 +19,7 @@ run_shellcheck_on () { local file file="$1" echo "Shellcheck: ${file}" - # TODO: add -f diff when shellcheck version allows (ubuntu > bionic) - shellcheck -x "$file" + shellcheck -f diff -x "$file" } run_shellchecks () { From ba403773b9306691698298be8c48cdeb805da52b Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Sat, 3 Oct 2020 09:59:30 +0100 Subject: [PATCH 3/4] update ubuntu image hashes Signed-off-by: Ryan Northey --- .bazelrc | 2 +- .circleci/config.yml | 2 +- .devcontainer/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bazelrc b/.bazelrc index 16dc47a92753..625d87d1e3d8 100644 --- a/.bazelrc +++ b/.bazelrc @@ -227,7 +227,7 @@ build:remote-clang-cl --config=rbe-toolchain-clang-cl # Docker sandbox # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/master/toolchains/rbe_toolchains_config.bzl#L8 -build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:1526786b8f5cfce7a40829a0c527b5a27570889c +build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:325803575903766a631b6e2fde79c6cbedb92985 build:docker-sandbox --spawn_strategy=docker build:docker-sandbox --strategy=Javac=docker build:docker-sandbox --strategy=Closure=docker diff --git a/.circleci/config.yml b/.circleci/config.yml index a414094321a3..0df22a0d83c1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ executors: description: "A regular build executor based on ubuntu image" docker: # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/master/toolchains/rbe_toolchains_config.bzl#L8 - - image: envoyproxy/envoy-build-ubuntu:1526786b8f5cfce7a40829a0c527b5a27570889c + - image: envoyproxy/envoy-build-ubuntu:325803575903766a631b6e2fde79c6cbedb92985 resource_class: xlarge working_directory: /source diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2493eea75cb6..2fa63bdc2a4a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/envoy-ci/envoy-build:1526786b8f5cfce7a40829a0c527b5a27570889c +FROM gcr.io/envoy-ci/envoy-build:325803575903766a631b6e2fde79c6cbedb92985 ARG USERNAME=vscode ARG USER_UID=501 From c6582e8d28522dd120c65670bbb41a2ee606885a Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Mon, 5 Oct 2020 17:39:28 +0100 Subject: [PATCH 4/4] update build hashes Signed-off-by: Ryan Northey --- .bazelrc | 2 +- .circleci/config.yml | 2 +- .devcontainer/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bazelrc b/.bazelrc index 625d87d1e3d8..dae08913379f 100644 --- a/.bazelrc +++ b/.bazelrc @@ -227,7 +227,7 @@ build:remote-clang-cl --config=rbe-toolchain-clang-cl # Docker sandbox # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/master/toolchains/rbe_toolchains_config.bzl#L8 -build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:325803575903766a631b6e2fde79c6cbedb92985 +build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:b480535e8423b5fd7c102fd30c92f4785519e33a build:docker-sandbox --spawn_strategy=docker build:docker-sandbox --strategy=Javac=docker build:docker-sandbox --strategy=Closure=docker diff --git a/.circleci/config.yml b/.circleci/config.yml index 0df22a0d83c1..467b3e872acc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ executors: description: "A regular build executor based on ubuntu image" docker: # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/master/toolchains/rbe_toolchains_config.bzl#L8 - - image: envoyproxy/envoy-build-ubuntu:325803575903766a631b6e2fde79c6cbedb92985 + - image: envoyproxy/envoy-build-ubuntu:b480535e8423b5fd7c102fd30c92f4785519e33a resource_class: xlarge working_directory: /source diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2fa63bdc2a4a..21f934c44944 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/envoy-ci/envoy-build:325803575903766a631b6e2fde79c6cbedb92985 +FROM gcr.io/envoy-ci/envoy-build:b480535e8423b5fd7c102fd30c92f4785519e33a ARG USERNAME=vscode ARG USER_UID=501