-
Notifications
You must be signed in to change notification settings - Fork 4.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ci: use small image and use remote_jdk #7786
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
96f8397
ci: use small image and not generating java configs
lizan 0a5365b
fix format requirement
lizan 7d303a2
testing with newer image
lizan 7702f38
just test
lizan 3934d27
just test
lizan a89bd7d
jdk11
lizan e98d715
just test
lizan 833add4
just test
lizan b7cc371
use image from other PR to test
lizan 07b1a64
revert tests, roll forward bazel-toolchains
lizan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 0.28.0 | ||
| 0.28.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
149 changes: 149 additions & 0 deletions
149
bazel/toolchains/configs/clang_libcxx/bazel_0.28.1/cc/BUILD
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| # Copyright 2016 The Bazel Authors. All rights reserved. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # This becomes the BUILD file for @local_config_cc// under non-FreeBSD unixes. | ||
|
|
||
| package(default_visibility = ["//visibility:public"]) | ||
|
|
||
| load(":cc_toolchain_config.bzl", "cc_toolchain_config") | ||
| load(":armeabi_cc_toolchain_config.bzl", "armeabi_cc_toolchain_config") | ||
|
|
||
| licenses(["notice"]) # Apache 2.0 | ||
|
|
||
| cc_library( | ||
| name = "malloc", | ||
| ) | ||
|
|
||
| filegroup( | ||
| name = "empty", | ||
| srcs = [], | ||
| ) | ||
|
|
||
| filegroup( | ||
| name = "cc_wrapper", | ||
| srcs = ["cc_wrapper.sh"], | ||
| ) | ||
|
|
||
| filegroup( | ||
| name = "compiler_deps", | ||
| srcs = glob(["extra_tools/**"], allow_empty = True) + [":empty"], | ||
| ) | ||
|
|
||
| # This is the entry point for --crosstool_top. Toolchains are found | ||
| # by lopping off the name of --crosstool_top and searching for | ||
| # the "${CPU}" entry in the toolchains attribute. | ||
| cc_toolchain_suite( | ||
| name = "toolchain", | ||
| toolchains = { | ||
| "k8|clang": ":cc-compiler-k8", | ||
| "k8": ":cc-compiler-k8", | ||
| "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a", | ||
| "armeabi-v7a": ":cc-compiler-armeabi-v7a", | ||
| }, | ||
| ) | ||
|
|
||
| cc_toolchain( | ||
| name = "cc-compiler-k8", | ||
| toolchain_identifier = "local", | ||
| toolchain_config = ":local", | ||
| all_files = ":compiler_deps", | ||
| ar_files = ":compiler_deps", | ||
| as_files = ":compiler_deps", | ||
| compiler_files = ":compiler_deps", | ||
| dwp_files = ":empty", | ||
| linker_files = ":compiler_deps", | ||
| objcopy_files = ":empty", | ||
| strip_files = ":empty", | ||
| supports_param_files = 1, | ||
| ) | ||
|
|
||
| cc_toolchain_config( | ||
| name = "local", | ||
| cpu = "k8", | ||
| compiler = "clang", | ||
| toolchain_identifier = "local", | ||
| host_system_name = "local", | ||
| target_system_name = "local", | ||
| target_libc = "local", | ||
| abi_version = "local", | ||
| abi_libc_version = "local", | ||
| cxx_builtin_include_directories = ["/usr/local/include", | ||
| "/usr/lib/llvm-8/lib/clang/8.0.1/include", | ||
| "/usr/include/x86_64-linux-gnu", | ||
| "/usr/include", | ||
| "/usr/lib/llvm-8/include/c++/v1", | ||
| "/usr/include/clang/8.0.1/include"], | ||
| tool_paths = {"ar": "/usr/bin/ar", | ||
| "ld": "/usr/bin/ld", | ||
| "cpp": "/usr/bin/cpp", | ||
| "gcc": "/usr/lib/llvm-8/bin/clang", | ||
| "dwp": "/usr/bin/dwp", | ||
| "gcov": "/usr/lib/llvm-8/bin/llvm-profdata", | ||
| "nm": "/usr/bin/nm", | ||
| "objcopy": "/usr/bin/objcopy", | ||
| "objdump": "/usr/bin/objdump", | ||
| "strip": "/usr/bin/strip"}, | ||
| compile_flags = ["-U_FORTIFY_SOURCE", | ||
| "-fstack-protector", | ||
| "-Wall", | ||
| "-Wthread-safety", | ||
| "-Wself-assign", | ||
| "-fcolor-diagnostics", | ||
| "-fno-omit-frame-pointer"], | ||
| opt_compile_flags = ["-g0", | ||
| "-O2", | ||
| "-D_FORTIFY_SOURCE=1", | ||
| "-DNDEBUG", | ||
| "-ffunction-sections", | ||
| "-fdata-sections"], | ||
| dbg_compile_flags = ["-g"], | ||
| cxx_flags = ["-stdlib=libc++"], | ||
| link_flags = ["-fuse-ld=gold", | ||
| "-Wl,-no-as-needed", | ||
| "-Wl,-z,relro,-z,now", | ||
| "-B/usr/lib/llvm-8/bin", | ||
| "-lm", | ||
| "-static-libgcc", | ||
| "-pthread", | ||
| "-fuse-ld=lld"], | ||
| link_libs = ["-l:libc++.a", | ||
| "-l:libc++abi.a"], | ||
| opt_link_flags = ["-Wl,--gc-sections"], | ||
| unfiltered_compile_flags = ["-no-canonical-prefixes", | ||
| "-Wno-builtin-macro-redefined", | ||
| "-D__DATE__=\"redacted\"", | ||
| "-D__TIMESTAMP__=\"redacted\"", | ||
| "-D__TIME__=\"redacted\""], | ||
| coverage_compile_flags = ["-fprofile-instr-generate", "-fcoverage-mapping"], | ||
| coverage_link_flags = ["-fprofile-instr-generate"], | ||
| supports_start_end_lib = True, | ||
| ) | ||
|
|
||
| # Android tooling requires a default toolchain for the armeabi-v7a cpu. | ||
| cc_toolchain( | ||
| name = "cc-compiler-armeabi-v7a", | ||
| toolchain_identifier = "stub_armeabi-v7a", | ||
| toolchain_config = ":stub_armeabi-v7a", | ||
| all_files = ":empty", | ||
| ar_files = ":empty", | ||
| as_files = ":empty", | ||
| compiler_files = ":empty", | ||
| dwp_files = ":empty", | ||
| linker_files = ":empty", | ||
| objcopy_files = ":empty", | ||
| strip_files = ":empty", | ||
| supports_param_files = 1, | ||
| ) | ||
|
|
||
| armeabi_cc_toolchain_config(name = "stub_armeabi-v7a") | ||
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
bazel/toolchains/configs/clang_libcxx/bazel_0.28.1/config/BUILD
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| # Copyright 2016 The Bazel Authors. All rights reserved. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # This file is auto-generated by an rbe_autoconfig repository rule | ||
| # and should not be modified directly. | ||
| # See @bazel_toolchains//rules:rbe_repo.bzl | ||
|
|
||
| package(default_visibility = ["//visibility:public"]) | ||
|
|
||
| toolchain( | ||
| name = "cc-toolchain", | ||
| exec_compatible_with = [ | ||
| "@bazel_tools//platforms:x86_64", | ||
| "@bazel_tools//platforms:linux", | ||
| "@bazel_tools//tools/cpp:clang", | ||
| ], | ||
| target_compatible_with = [ | ||
| "@bazel_tools//platforms:linux", | ||
| "@bazel_tools//platforms:x86_64", | ||
| ], | ||
| toolchain = "//bazel/toolchains/configs/clang_libcxx/bazel_0.28.1/cc:cc-compiler-k8", | ||
| toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", | ||
| ) | ||
|
|
||
| platform( | ||
| name = "platform", | ||
| constraint_values = [ | ||
| "@bazel_tools//platforms:x86_64", | ||
| "@bazel_tools//platforms:linux", | ||
| "@bazel_tools//tools/cpp:clang", | ||
| ], | ||
| remote_execution_properties = """ | ||
| properties: { | ||
| name: "container-image" | ||
| value:"docker://gcr.io/envoy-ci/envoy-build@sha256:555fb7b0aa578d11852b57c6c14fd54ab4450ad001a9f03bb5c43d5454460c28" | ||
| } | ||
| properties { | ||
| name: "OSFamily" | ||
| value: "Linux" | ||
| } | ||
| """, | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you think you can move this to some other repository that we consume, to reduce the churn in the main Envoy repo? Just a suggestion, we can ship this PR as is.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes it is totally possible to have whole
bazel/toolchains/configsin a separate repo, or even just a generated tar in somewhere (like the build image). It just need more bash snafu to automate the generate process though.I don't expect much more churn from here other than every bazel update (likely it will be just rename based on Bazel version) or adding new configuration (e.g. MSAN)