Skip to content

Commit

Permalink
bazel: update bazel to 0.29.1 (envoyproxy#8198)
Browse files Browse the repository at this point in the history
Description:
Upgrade bazel to 0.29.1 and bazel-toolchains to corresponding version.

Risk Level: Low
Testing: CI
Docs Changes: N/A
Release Notes: N/A

Signed-off-by: Lizan Zhou <[email protected]>
  • Loading branch information
lizan authored and danzh1989 committed Sep 24, 2019
1 parent d4ea937 commit 803e1ac
Show file tree
Hide file tree
Showing 25 changed files with 203 additions and 358 deletions.
7 changes: 7 additions & 0 deletions .azure-pipelines/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ jobs:
displayName: "Check disk space at end"
condition: always()
- task: PublishTestResults@2
inputs:
testResultsFiles: '**/bazel-out/**/testlogs/**/test.xml'
testRunTitle: '$(CI_TARGET)'
searchFolder: $(Build.StagingDirectory)/tmp
condition: always()

- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: "$(Build.StagingDirectory)/envoy"
Expand Down
3 changes: 1 addition & 2 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,12 @@ build:remote --auth_enabled=true
build:remote --experimental_inmemory_jdeps_files
build:remote --experimental_inmemory_dotd_files
build:remote --experimental_remote_download_outputs=toplevel
test:remote --experimental_remote_download_outputs=minimal

build:remote-clang --config=remote
build:remote-clang --config=rbe-toolchain-clang

# Docker sandbox
build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build:8246167b9d238797cbc6c03dccc9e3921c37617d
build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build@sha256:9236915d10004a35f2439ce4a1c33c1dbb06f95f84c4a4497d4e4f95cdc9e07f
build:docker-sandbox --spawn_strategy=docker
build:docker-sandbox --strategy=Javac=docker
build:docker-sandbox --strategy=Closure=docker
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.28.1
0.29.1
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ executors:
description: "A regular build executor based on ubuntu image"
docker:
# NOTE: Update bazel/toolchains/rbe_toolchains_config.bzl with sha256 digest to match the image here.
- image: envoyproxy/envoy-build:cd8574de783791b3353579b489222bfda74888da
- image: envoyproxy/envoy-build:cb15cc3d2010aff77d6e022ddf6d723fa8becbc0
resource_class: xlarge
working_directory: /source

Expand Down
9 changes: 6 additions & 3 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/0.18.1/bazel-gazelle-0.18.1.tar.gz"],
),
bazel_toolchains = dict(
sha256 = "b72e7a911436b2900b05759a1fcd735070edbd4442f0a3506ef021fdcd6e15b3",
strip_prefix = "bazel-toolchains-0.28.5",
urls = ["https://github.com/bazelbuild/bazel-toolchains/archive/0.28.5.tar.gz"],
sha256 = "ab0d8aaeaeeef413ddb03922dbdb99bbae9e1b2c157a87c77d70d45a830be5b0",
strip_prefix = "bazel-toolchains-0.29.1",
urls = [
"https://github.com/bazelbuild/bazel-toolchains/releases/download/0.29.1/bazel-toolchains-0.29.1.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.29.1.tar.gz",
],
),
boringssl = dict(
sha256 = "c712766ddc844de2a38e686e1cdd7288795e9a6fe7f699c6636f1b76703db84e",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package(default_visibility = ["//visibility:public"])

load(":cc_toolchain_config.bzl", "cc_toolchain_config")
load(":armeabi_cc_toolchain_config.bzl", "armeabi_cc_toolchain_config")
load("@rules_cc//cc:defs.bzl", "cc_toolchain", "cc_toolchain_suite")

licenses(["notice"]) # Apache 2.0

Expand All @@ -37,7 +38,7 @@ filegroup(

filegroup(
name = "compiler_deps",
srcs = glob(["extra_tools/**"], allow_empty = True) + [":empty"],
srcs = glob(["extra_tools/**"], allow_empty = True) + [":builtin_include_directory_paths"],
)

# This is the entry point for --crosstool_top. Toolchains are found
Expand Down Expand Up @@ -111,7 +112,7 @@ cc_toolchain_config(
"-fdata-sections"],
dbg_compile_flags = ["-g"],
cxx_flags = ["-std=c++0x"],
link_flags = ["-fuse-ld=gold",
link_flags = ["-fuse-ld=/usr/bin/ld.gold",
"-Wl,-no-as-needed",
"-Wl,-z,relro,-z,now",
"-B/usr/lib/llvm-8/bin",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
This file is generated by cc_configure and contains builtin include directories
that /usr/lib/llvm-8/bin/clang reported. This file is a dependency of every compilation action and
changes to it will be reflected in the action cache key. When some of these
paths change, Bazel will make sure to rerun the action, even though none of
declared action inputs or the action commandline changes.

/usr/local/include
/usr/lib/llvm-8/lib/clang/8.0.1/include
/usr/include/x86_64-linux-gnu
/usr/include
/usr/include/c++/7.4.0
/usr/include/x86_64-linux-gnu/c++/7.4.0
/usr/include/c++/7.4.0/backward
/usr/include/clang/8.0.1/include
Loading

0 comments on commit 803e1ac

Please sign in to comment.