Skip to content

Commit

Permalink
Update bazel_toolchains to latest release and add toolchain config ta…
Browse files Browse the repository at this point in the history
…rget for BuildKite CI (rbe_ubuntu1604)

RELNOTES: None.
PiperOrigin-RevId: 237233612
  • Loading branch information
Googler authored and copybara-github committed Mar 7, 2019
1 parent a178f41 commit de0612a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 8 deletions.
6 changes: 4 additions & 2 deletions .bazelci/postsubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,10 @@ platforms:
- "//src:all_windows_tests"
rbe_ubuntu1604:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
android_ndk_repository/android_ndk_repository/' WORKSPACE
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/'
-e 's/^# android_ndk_repository/android_ndk_repository/'
-e 's/^# rbe_autoconfig/rbe_autoconfig/'
-e 's/^# load("@bazel_toolchains/load("@bazel_toolchains/' WORKSPACE
- rm -f WORKSPACE.bak
build_targets:
- "//src:bazel"
Expand Down
6 changes: 4 additions & 2 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,10 @@ platforms:
- "//src:all_windows_tests"
rbe_ubuntu1604:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
android_ndk_repository/android_ndk_repository/' WORKSPACE
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/'
-e 's/^# android_ndk_repository/android_ndk_repository/'
-e 's/^# rbe_autoconfig/rbe_autoconfig/'
-e 's/^# load("@bazel_toolchains/load("@bazel_toolchains/' WORKSPACE
- rm -f WORKSPACE.bak
build_targets:
- "//src:bazel"
Expand Down
14 changes: 10 additions & 4 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,20 @@ http_file(

http_archive(
name = "bazel_toolchains",
sha256 = "109a99384f9d08f9e75136d218ebaebc68cc810c56897aea2224c57932052d30",
strip_prefix = "bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7",
sha256 = "4b1468b254a572dbe134cc1fd7c6eab1618a72acd339749ea343bd8f55c3b7eb",
strip_prefix = "bazel-toolchains-d665ccfa3e9c90fa789671bf4ef5f7c19c5715c4",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/d665ccfa3e9c90fa789671bf4ef5f7c19c5715c4.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/archive/d665ccfa3e9c90fa789671bf4ef5f7c19c5715c4.tar.gz",
],
)

# Creates toolchain configuration for remote execution with BuildKite CI
# for rbe_ubuntu1604.
# To run the tests with RBE on BuildKite CI uncomment the two lines below
# load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
# rbe_autoconfig(name = "buildkite_config")

# We're pinning to a commit because this project does not have a recent release.
# Nothing special about this commit, though.
http_archive(
Expand Down

0 comments on commit de0612a

Please sign in to comment.