Skip to content

Commit

Permalink
Update to rbe docker image to python3
Browse files Browse the repository at this point in the history
Had to add libzstd-dev as that is now a breakpad dependency
Also updated chromium-linux docker image to use new
install-build-deps.py script

Test: Presubmits pass
Bug: b/303434418

Change-Id: I453af350a7e7aa98dc5326d3247959618eecd17d
GitOrigin-RevId: cbeae631d552918d64426054e0db3679802e960e
  • Loading branch information
bentekkie authored and copybara-github committed Oct 4, 2023
1 parent 8182a4e commit c27c63f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .bazelversion
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ When upgrading bazel, you must also upgrade toolchains.
2. Run it for Linux:

```
RECLIENT_BUILDER_V=v12
NEW_BAZEL_VERSION=5.3.0
PATH_TO_RECLIENT=$PWD
GCR_IMAGE=gcr.io/reclient-releases/reclient-builder:${RECLIENT_BUILDER_V}
export RECLIENT_BUILDER_V=v13
export NEW_BAZEL_VERSION=5.3.0
export PATH_TO_RECLIENT=$PWD
export GCR_IMAGE=gcr.io/reclient-releases/reclient-builder:${RECLIENT_BUILDER_V}
rbe_configs_gen \
--output_src_root=${PATH_TO_RECLIENT} \
--output_config_path=configs/linux \
Expand Down
4 changes: 4 additions & 0 deletions configs/linux/cc/module.modulemap
Original file line number Diff line number Diff line change
Expand Up @@ -4043,8 +4043,12 @@ module "crosstool" [system] {
textual header "/usr/include/xen/gntalloc.h"
textual header "/usr/include/xen/gntdev.h"
textual header "/usr/include/xen/privcmd.h"
textual header "/usr/include/zbuff.h"
textual header "/usr/include/zconf.h"
textual header "/usr/include/zdict.h"
textual header "/usr/include/zlib.h"
textual header "/usr/include/zstd.h"
textual header "/usr/include/zstd_errors.h"
textual header "/usr/local/lib/clang/12.0.0/share/asan_blacklist.txt"
textual header "/usr/local/lib/clang/12.0.0/share/msan_blacklist.txt"
textual header "/usr/include/c++/7.5.0/algorithm"
Expand Down
2 changes: 1 addition & 1 deletion configs/linux/config/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ platform(
"@bazel_tools//tools/cpp:clang",
],
exec_properties = {
"container-image": "docker://gcr.io/reclient-releases/reclient-builder@sha256:e594978edd2078570df4b01fdaf67c361d67ea5cac46aff768f47b844c43a183",
"container-image": "docker://gcr.io/reclient-releases/reclient-builder@sha256:5bd9f692d62ca35acb6849ab5ddb1cd7447719755d09d3ce43ff14e6a869d937",
"OSFamily": "Linux",
},
parents = ["@local_config_platform//:host"],
Expand Down

0 comments on commit c27c63f

Please sign in to comment.