File tree Expand file tree Collapse file tree 2 files changed +8
-2
lines changed
Expand file tree Collapse file tree 2 files changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -276,14 +276,14 @@ build:rbe-toolchain-clang --platforms=@envoy_build_tools//toolchains:rbe_linux_c
276276build:rbe-toolchain-clang --host_platform=@envoy_build_tools//toolchains:rbe_linux_clang_platform
277277build:rbe-toolchain-clang --crosstool_top=@envoy_build_tools//toolchains/configs/linux/clang/cc:toolchain
278278build:rbe-toolchain-clang --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/clang/config:cc-toolchain
279- build:rbe-toolchain-clang --action_env=CC=clang --action_env=CXX=clang++ --action_env=PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin
279+ build:rbe-toolchain-clang --action_env=CC=clang --action_env=CXX=clang++
280280
281281build:rbe-toolchain-clang-libc++ --config=rbe-toolchain
282282build:rbe-toolchain-clang-libc++ --platforms=@envoy_build_tools//toolchains:rbe_linux_clang_libcxx_platform
283283build:rbe-toolchain-clang-libc++ --host_platform=@envoy_build_tools//toolchains:rbe_linux_clang_libcxx_platform
284284build:rbe-toolchain-clang-libc++ --crosstool_top=@envoy_build_tools//toolchains/configs/linux/clang_libcxx/cc:toolchain
285285build:rbe-toolchain-clang-libc++ --extra_toolchains=@envoy_build_tools//toolchains/configs/linux/clang_libcxx/config:cc-toolchain
286- build:rbe-toolchain-clang-libc++ --action_env=CC=clang --action_env=CXX=clang++ --action_env=PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin
286+ build:rbe-toolchain-clang-libc++ --action_env=CC=clang --action_env=CXX=clang++
287287build:rbe-toolchain-clang-libc++ --action_env=CXXFLAGS=-stdlib=libc++
288288build:rbe-toolchain-clang-libc++ --action_env=LDFLAGS=-stdlib=libc++
289289build:rbe-toolchain-clang-libc++ --define force_libcpp=enabled
Original file line number Diff line number Diff line change @@ -95,6 +95,11 @@ VOLUMES=(
9595 -v " ${ENVOY_DOCKER_BUILD_DIR} " :" ${BUILD_DIR_MOUNT_DEST} "
9696 -v " ${SOURCE_DIR} " :" ${SOURCE_DIR_MOUNT_DEST} " )
9797
98+ if [[ -n " $MOUNT_GPG_HOME " ]]; then
99+ VOLUMES+=(
100+ -v " ${HOME} /.gnupg:${BUILD_DIR_MOUNT_DEST} /.gnupg" )
101+ fi
102+
98103if ! is_windows; then
99104 export BUILD_DIR=" ${BUILD_DIR_MOUNT_DEST} "
100105fi
@@ -154,6 +159,7 @@ docker run --rm \
154159 -e ENVOY_PUBLISH_DRY_RUN \
155160 -e ENVOY_REPO \
156161 -e ENVOY_TARBALL_DIR \
162+ -e ENVOY_GEN_COMPDB_OPTIONS \
157163 -e SYSTEM_PULLREQUEST_PULLREQUESTNUMBER \
158164 -e GCS_ARTIFACT_BUCKET \
159165 -e GITHUB_REF_NAME \
You can’t perform that action at this time.
0 commit comments