bazel/rules_foreign_cc
2
0
Fork 0
mirror of https://github.com/bazel-contrib/rules_foreign_cc synced 2024-11-28 08:43:26 +00:00
Code Issues Releases Activity

Fix RBE by using updated bazel-toolchains version (#654)

Browse source
This commit is contained in:
UebelAndre 2021-05-21 11:40:34 -07:00 committed by GitHub
parent 6202e299a6
commit 4010620160
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 58 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
WORKSPACE → WORKSPACE.bazel
View file

@ -28,13 +28,17 @@ bazel_skylib_workspace()
http_archive( http_archive(
name = "bazel_toolchains", name = "bazel_toolchains",
sha256 = "1adf7a8e9901287c644dcf9ca08dd8d67a69df94bedbd57a841490a84dc1e9ed", sha256 = "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024",
strip_prefix = "bazel-toolchains-5.0.0", strip_prefix = "bazel-toolchains-4.1.0",
urls = [ urls = [
"https://github.com/bazelbuild/bazel-toolchains/archive/v5.0.0.tar.gz", "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz",
], ],
) )
load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig") load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
# Creates a default toolchain config for RBE.
# Use this as is if you are using the rbe_ubuntu16_04 container,
# otherwise refer to RBE docs.
rbe_autoconfig(name = "buildkite_config") rbe_autoconfig(name = "buildkite_config")

26
examples/WORKSPACE → examples/WORKSPACE.bazel
View file

@ -1,21 +1,10 @@
workspace(name = "rules_foreign_cc_examples") workspace(name = "rules_foreign_cc_examples")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
local_repository( local_repository(
name = "rules_foreign_cc", name = "rules_foreign_cc",
path = "..", path = "..",
) )
http_archive(
name = "bazel_toolchains",
sha256 = "1adf7a8e9901287c644dcf9ca08dd8d67a69df94bedbd57a841490a84dc1e9ed",
strip_prefix = "bazel-toolchains-5.0.0",
urls = [
"https://github.com/bazelbuild/bazel-toolchains/archive/v5.0.0.tar.gz",
],
)
load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies") load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
# Don't use preinstalled tools to ensure builds are as hermetic as possible # Don't use preinstalled tools to ensure builds are as hermetic as possible
@ -46,6 +35,21 @@ load("@rules_foreign_cc_examples_third_party//:repositories.bzl", examples_third
examples_third_party_repositories() examples_third_party_repositories()
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name = "bazel_toolchains",
sha256 = "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024",
strip_prefix = "bazel-toolchains-4.1.0",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz",
],
)
load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig") load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
# Creates a default toolchain config for RBE.
# Use this as is if you are using the rbe_ubuntu16_04 container,
# otherwise refer to RBE docs.
rbe_autoconfig(name = "buildkite_config") rbe_autoconfig(name = "buildkite_config")

0
examples/cmake_crosstool/WORKSPACE → examples/cmake_crosstool/WORKSPACE.bazel
View file

10
test/detect_root_test/WORKSPACE → test/detect_root_test/WORKSPACE.bazel
View file

@ -36,13 +36,17 @@ filegroup(
http_archive( http_archive(
name = "bazel_toolchains", name = "bazel_toolchains",
sha256 = "1adf7a8e9901287c644dcf9ca08dd8d67a69df94bedbd57a841490a84dc1e9ed", sha256 = "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024",
strip_prefix = "bazel-toolchains-5.0.0", strip_prefix = "bazel-toolchains-4.1.0",
urls = [ urls = [
"https://github.com/bazelbuild/bazel-toolchains/archive/v5.0.0.tar.gz", "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz",
], ],
) )
load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig") load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
# Creates a default toolchain config for RBE.
# Use this as is if you are using the rbe_ubuntu16_04 container,
# otherwise refer to RBE docs.
rbe_autoconfig(name = "buildkite_config") rbe_autoconfig(name = "buildkite_config")

25
test/standard_cxx_flags_test/WORKSPACE
View file

@ -1,25 +0,0 @@
workspace(name = "standard_cxx_flags_test")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
local_repository(
name = "rules_foreign_cc",
path = "../..",
)
load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
rules_foreign_cc_dependencies()
http_archive(
name = "bazel_toolchains",
sha256 = "1adf7a8e9901287c644dcf9ca08dd8d67a69df94bedbd57a841490a84dc1e9ed",
strip_prefix = "bazel-toolchains-5.0.0",
urls = [
"https://github.com/bazelbuild/bazel-toolchains/archive/v5.0.0.tar.gz",
],
)
load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
rbe_autoconfig(name = "buildkite_config")

29
test/standard_cxx_flags_test/WORKSPACE.bazel Normal file
View file

@ -0,0 +1,29 @@
workspace(name = "standard_cxx_flags_test")
local_repository(
name = "rules_foreign_cc",
path = "../..",
)
load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
rules_foreign_cc_dependencies()
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name = "bazel_toolchains",
sha256 = "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024",
strip_prefix = "bazel-toolchains-4.1.0",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz",
],
)
load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
# Creates a default toolchain config for RBE.
# Use this as is if you are using the rbe_ubuntu16_04 container,
# otherwise refer to RBE docs.
rbe_autoconfig(name = "buildkite_config")