container release for clang r327695 (#26)
Tested:
- container/build.sh -l -d debian8
- container/build.sh -l -d debian9
- container/build.sh -l -d ubuntu16_04
- container/build.sh -p my-project -d debian8 -c test-rbe-debian8 -t test-r327695 -b my-gcs-bucket -a
- container/build.sh -p my-project -d debian9 -c test-rbe-debian9 -t test-r327695 -b my-gcs-bucket -a
- container/build.sh -p my-project -d ubuntu16_04 -c test-rbe-ubuntu16_04 -t test-r327695 -b my-gcs-bucket -a
diff --git a/WORKSPACE b/WORKSPACE
index fcbf25d..5499c79 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -58,7 +58,7 @@
container_pull(
name = "debian8-clang",
- digest = "sha256:feec68e34edc42f4c3b21720670003b0d76100fea8c06f965cd3687a2a66bfcf",
+ digest = "sha256:213da2494bb763f55363213db45d9bfa5eb906039fc02e6cb2e6637dc4917caf",
registry = "gcr.io",
repository = "cloud-marketplace/google/clang-debian8",
)
@@ -183,11 +183,17 @@
# Clang
http_file(
- name = "clang_release",
- sha256 = "c2c4d6c9eb98686a8fcee3c75a864baaccd51e2bd6095e1b98dbf0ce3a512bf9",
+ name = "debian8_clang_release",
+ sha256 = "588ddbd83c32e7ab87fad58038c3712f6d1b0056f12ea746169ac7ecd33c93bf",
urls = ["https://storage.googleapis.com/clang-builds-stable/clang-debian8/clang_" + CLANG_REVISION + ".tar.gz"],
)
+http_file(
+ name = "ubuntu16_04_clang_release",
+ sha256 = "48bfc470810d483ffb2e826ed3540efc1da45fa89f416f8efa439242495e6239",
+ urls = ["https://storage.googleapis.com/clang-builds-stable/clang-ubuntu16_04/clang_" + CLANG_REVISION + ".tar.gz"],
+)
+
# Test purpose only. bazel-toolchains repo at release for Bazel 0.10.0.
# https://github.com/bazelbuild/bazel-toolchains/releases/tag/acffd62
http_file(
diff --git a/container/experimental/rbe-debian8/BUILD b/container/experimental/rbe-debian8/BUILD
index 9014051..b5c5431 100644
--- a/container/experimental/rbe-debian8/BUILD
+++ b/container/experimental/rbe-debian8/BUILD
@@ -66,7 +66,7 @@
"CC": "/usr/local/bin/clang",
},
tags = ["manual"],
- tars = ["//third_party/clang:tar"],
+ tars = ["//third_party/clang:debian8_tar"],
)
container_layer(
diff --git a/container/experimental/rbe-debian9/BUILD b/container/experimental/rbe-debian9/BUILD
index af59a5c..201aeed 100644
--- a/container/experimental/rbe-debian9/BUILD
+++ b/container/experimental/rbe-debian9/BUILD
@@ -68,7 +68,8 @@
packages = [
"libstdc++-6-dev",
],
- tars = ["//third_party/clang:tar"],
+ # TODO: change to clang for debian9 once it's available.
+ tars = ["//third_party/clang:debian8_tar"],
)
language_tool_layer(
diff --git a/container/experimental/rbe-ubuntu16_04/BUILD b/container/experimental/rbe-ubuntu16_04/BUILD
index 3788b34..a031850 100644
--- a/container/experimental/rbe-ubuntu16_04/BUILD
+++ b/container/experimental/rbe-ubuntu16_04/BUILD
@@ -68,7 +68,7 @@
packages = [
"libstdc++-4.9-dev",
],
- tars = ["//third_party/clang:tar"],
+ tars = ["//third_party/clang:ubuntu16_04_tar"],
)
language_tool_layer(
diff --git a/container/rbe-debian8/BUILD b/container/rbe-debian8/BUILD
index 7a95339..bdcd657 100644
--- a/container/rbe-debian8/BUILD
+++ b/container/rbe-debian8/BUILD
@@ -68,7 +68,7 @@
packages = [
"libstdc++-4.9-dev",
],
- tars = ["//third_party/clang:tar"],
+ tars = ["//third_party/clang:debian8_tar"],
)
language_tool_layer(
diff --git a/third_party/clang/BUILD b/third_party/clang/BUILD
index e2adc5f..f1d4530 100644
--- a/third_party/clang/BUILD
+++ b/third_party/clang/BUILD
@@ -25,7 +25,7 @@
load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
pkg_tar(
- name = "tar",
+ name = "debian8_tar",
srcs = glob(
["**/*"],
exclude = ["**/BUILD"],
@@ -34,6 +34,20 @@
strip_prefix = ".",
tags = ["manual"],
deps = [
- "@clang_release//file",
+ "@debian8_clang_release//file",
+ ],
+)
+
+pkg_tar(
+ name = "ubuntu16_04_tar",
+ srcs = glob(
+ ["**/*"],
+ exclude = ["**/BUILD"],
+ ),
+ package_dir = "/usr/local/",
+ strip_prefix = ".",
+ tags = ["manual"],
+ deps = [
+ "@ubuntu16_04_clang_release//file",
],
)
diff --git a/third_party/clang/revision.bzl b/third_party/clang/revision.bzl
index e05ebc5..b3405f7 100644
--- a/third_party/clang/revision.bzl
+++ b/third_party/clang/revision.bzl
@@ -1 +1 @@
-CLANG_REVISION="r324073"
+CLANG_REVISION="r327695"
