Skip to content

Commit

Permalink
Updates to mobile/third_party/rbe_configs/cc/ (envoyproxy#36269)
Browse files Browse the repository at this point in the history
This updates files containing paths to older versions of the docker
container being used in CI. This matters when clang modules are being
used and some dependency (looking at absl) turns on layering checks. Not
updating these files prevents abseil from including many standard
headers.

These files should be regenerated whenever our base docker container or
toolchain is updated.

These files were regenerated following the instructions in
https://github.com/bazelbuild/bazel-toolchains

Specifically:

```
$ ./rbe_configs_gen \
  --bazel_version="6.5.0" \
  --toolchain_container="docker.io/envoyproxy/envoy-build-ubuntu:f94a38f62220a2b017878b790b6ea98a0f6c5f9c" \
  --exec_os="linux" \
  --target_os="linux" \
  --output_src_root="/path/to/envoy-mobile" \
  --output_config_path="third_party/rbe_configs" \
  --cpp_env_json=clang.json \
  --generate_java_configs=False
$ cat clang.json
{"CC": "/opt/llvm/bin/clang", "CXX": "/opt/llvm/bin/clang++"}
```

Other files were also regenerated, but this commit only contains changes
to files with paths.

Risk Level: low
Testing: CI, since this specifically affects the CI.

Signed-off-by: Alejandro R Sedeño <[email protected]>
  • Loading branch information
asedeno authored Sep 20, 2024
1 parent cfb1b7e commit a65a5b6
Show file tree
Hide file tree
Showing 3 changed files with 1,909 additions and 1,827 deletions.
7 changes: 4 additions & 3 deletions mobile/third_party/rbe_configs/cc/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,10 @@ cc_toolchain_config(
"/usr/include/x86_64-linux-gnu",
"/usr/include",
"/opt/llvm/lib/clang/14.0.0/share",
"/usr/include/c++/9",
"/usr/include/x86_64-linux-gnu/c++/9",
"/usr/include/c++/9/backward",
"/usr/include/c++/11",
"/usr/include/x86_64-linux-gnu/c++/11",
"/usr/include/c++/11/backward",
"/opt/llvm/include/x86_64-unknown-linux-gnu/c++/v1",
"/opt/llvm/include/c++/v1"],
tool_paths = {"ar": "/usr/bin/ar",
"ld": "/usr/bin/ld",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ declared action inputs or the action commandline changes.
/usr/include/x86_64-linux-gnu
/usr/include
/opt/llvm/lib/clang/14.0.0/share
/usr/include/c++/9
/usr/include/x86_64-linux-gnu/c++/9
/usr/include/c++/9/backward
/usr/include/c++/11
/usr/include/x86_64-linux-gnu/c++/11
/usr/include/c++/11/backward
/opt/llvm/include/x86_64-unknown-linux-gnu/c++/v1
/opt/llvm/include/c++/v1
Loading

0 comments on commit a65a5b6

Please sign in to comment.