From 4d7bc66a2b6d5a6bfb7af3abc2b6683b2325ba0b Mon Sep 17 00:00:00 2001 From: Andre Brisco Date: Fri, 21 May 2021 09:08:27 -0700 Subject: [PATCH 1/2] Renamed WORKSPACE -> WORKSPACE.bazel --- WORKSPACE => WORKSPACE.bazel | 0 examples/{WORKSPACE => WORKSPACE.bazel} | 0 examples/cmake_crosstool/{WORKSPACE => WORKSPACE.bazel} | 0 test/detect_root_test/{WORKSPACE => WORKSPACE.bazel} | 0 test/standard_cxx_flags_test/{WORKSPACE => WORKSPACE.bazel} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename WORKSPACE => WORKSPACE.bazel (100%) rename examples/{WORKSPACE => WORKSPACE.bazel} (100%) rename examples/cmake_crosstool/{WORKSPACE => WORKSPACE.bazel} (100%) rename test/detect_root_test/{WORKSPACE => WORKSPACE.bazel} (100%) rename test/standard_cxx_flags_test/{WORKSPACE => WORKSPACE.bazel} (100%) diff --git a/WORKSPACE b/WORKSPACE.bazel similarity index 100% rename from WORKSPACE rename to WORKSPACE.bazel diff --git a/examples/WORKSPACE b/examples/WORKSPACE.bazel similarity index 100% rename from examples/WORKSPACE rename to examples/WORKSPACE.bazel diff --git a/examples/cmake_crosstool/WORKSPACE b/examples/cmake_crosstool/WORKSPACE.bazel similarity index 100% rename from examples/cmake_crosstool/WORKSPACE rename to examples/cmake_crosstool/WORKSPACE.bazel diff --git a/test/detect_root_test/WORKSPACE b/test/detect_root_test/WORKSPACE.bazel similarity index 100% rename from test/detect_root_test/WORKSPACE rename to test/detect_root_test/WORKSPACE.bazel diff --git a/test/standard_cxx_flags_test/WORKSPACE b/test/standard_cxx_flags_test/WORKSPACE.bazel similarity index 100% rename from test/standard_cxx_flags_test/WORKSPACE rename to test/standard_cxx_flags_test/WORKSPACE.bazel From bdba29a1dd04ca1f356984d8d7e29687a340bae4 Mon Sep 17 00:00:00 2001 From: Andre Brisco Date: Fri, 21 May 2021 09:19:13 -0700 Subject: [PATCH 2/2] Updated bazel-toolchains --- WORKSPACE.bazel | 10 +++++--- examples/WORKSPACE.bazel | 26 +++++++++++--------- test/detect_root_test/WORKSPACE.bazel | 10 +++++--- test/standard_cxx_flags_test/WORKSPACE.bazel | 14 +++++++---- 4 files changed, 38 insertions(+), 22 deletions(-) diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index 1527fce72..2365570d5 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -28,13 +28,17 @@ bazel_skylib_workspace() http_archive( name = "bazel_toolchains", - sha256 = "1adf7a8e9901287c644dcf9ca08dd8d67a69df94bedbd57a841490a84dc1e9ed", - strip_prefix = "bazel-toolchains-5.0.0", + sha256 = "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024", + strip_prefix = "bazel-toolchains-4.1.0", 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") +# 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") diff --git a/examples/WORKSPACE.bazel b/examples/WORKSPACE.bazel index eff6c08a4..2012b6bb9 100644 --- a/examples/WORKSPACE.bazel +++ b/examples/WORKSPACE.bazel @@ -1,21 +1,10 @@ workspace(name = "rules_foreign_cc_examples") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - local_repository( name = "rules_foreign_cc", 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") # 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() +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") diff --git a/test/detect_root_test/WORKSPACE.bazel b/test/detect_root_test/WORKSPACE.bazel index cc5427f5d..f6710cf2f 100644 --- a/test/detect_root_test/WORKSPACE.bazel +++ b/test/detect_root_test/WORKSPACE.bazel @@ -36,13 +36,17 @@ filegroup( http_archive( name = "bazel_toolchains", - sha256 = "1adf7a8e9901287c644dcf9ca08dd8d67a69df94bedbd57a841490a84dc1e9ed", - strip_prefix = "bazel-toolchains-5.0.0", + sha256 = "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024", + strip_prefix = "bazel-toolchains-4.1.0", 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") +# 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") diff --git a/test/standard_cxx_flags_test/WORKSPACE.bazel b/test/standard_cxx_flags_test/WORKSPACE.bazel index b63cc0da5..f06ae032f 100644 --- a/test/standard_cxx_flags_test/WORKSPACE.bazel +++ b/test/standard_cxx_flags_test/WORKSPACE.bazel @@ -1,7 +1,5 @@ workspace(name = "standard_cxx_flags_test") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - local_repository( name = "rules_foreign_cc", path = "../..", @@ -11,15 +9,21 @@ load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_depende rules_foreign_cc_dependencies() +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + http_archive( name = "bazel_toolchains", - sha256 = "1adf7a8e9901287c644dcf9ca08dd8d67a69df94bedbd57a841490a84dc1e9ed", - strip_prefix = "bazel-toolchains-5.0.0", + sha256 = "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024", + strip_prefix = "bazel-toolchains-4.1.0", 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") +# 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")