Skip to content

Commit bbd58c9

Browse files
alan-agius4dgp1130
authored andcommitted
build: fix bazel docker error
(cherry picked from commit d0eedc2)
1 parent c614506 commit bbd58c9

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

WORKSPACE

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ web_test_repositories()
116116
# Bring in bazel_toolchains for RBE setup configuration.
117117
http_archive(
118118
name = "bazel_toolchains",
119-
sha256 = "0b36eef8a66f39c8dbae88e522d5bbbef49d5e66e834a982402c79962281be10",
120-
strip_prefix = "bazel-toolchains-1.0.1",
121-
url = "https://github.com/bazelbuild/bazel-toolchains/archive/1.0.1.tar.gz",
119+
sha256 = "c969f09ffb8ca202692c68b17727fe5c1a8d94cd320e6d62e6c06c75e7d2b723",
120+
strip_prefix = "bazel-toolchains-1.2.1",
121+
url = "https://github.com/bazelbuild/bazel-toolchains/archive/1.2.1.tar.gz",
122122
)
123123

124124
load("@bazel_toolchains//rules:environments.bzl", "clang_env")
@@ -129,14 +129,14 @@ rbe_autoconfig(
129129
# Need to specify a base container digest in order to ensure that we can use the checked-in
130130
# platform configurations for the "ubuntu16_04" image. Otherwise the autoconfig rule would
131131
# need to pull the image and run it in order determine the toolchain configuration. See:
132-
# https://github.com/bazelbuild/bazel-toolchains/blob/0.27.0/configs/ubuntu16_04_clang/versions.bzl
133-
base_container_digest = "sha256:94d7d8552902d228c32c8c148cc13f0effc2b4837757a6e95b73fdc5c5e4b07b",
132+
# https://github.com/bazelbuild/bazel-toolchains/blob/1.1.2/configs/ubuntu16_04_clang/versions.bzl
133+
base_container_digest = "sha256:1ab40405810effefa0b2f45824d6d608634ccddbf06366760c341ef6fbead011",
134134
# Note that if you change the `digest`, you might also need to update the
135135
# `base_container_digest` to make sure marketplace.gcr.io/google/rbe-ubuntu16-04-webtest:<digest>
136136
# and marketplace.gcr.io/google/rbe-ubuntu16-04:<base_container_digest> have
137137
# the same Clang and JDK installed. Clang is needed because of the dependency on
138138
# @com_google_protobuf. Java is needed for the Bazel's test executor Java tool.
139-
digest = "sha256:76e2e4a894f9ffbea0a0cb2fbde741b5d223d40f265dbb9bca78655430173990",
139+
digest = "sha256:0b8fa87db4b8e5366717a7164342a029d1348d2feea7ecc4b18c780bc2507059",
140140
env = clang_env(),
141141
registry = "marketplace.gcr.io",
142142
# We can't use the default "ubuntu16_04" RBE image provided by the autoconfig because we need

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"devDependencies": {
8686
"@angular/compiler": "9.0.0-rc.3",
8787
"@angular/compiler-cli": "9.0.0-rc.3",
88-
"@bazel/bazel": "1.1.0",
88+
"@bazel/bazel": "1.2.0",
8989
"@bazel/buildifier": "0.29.0",
9090
"@bazel/jasmine": "0.39.0",
9191
"@bazel/karma": "0.39.0",

yarn.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -751,31 +751,31 @@
751751
lodash "^4.17.13"
752752
to-fast-properties "^2.0.0"
753753

754-
"@bazel/bazel-darwin_x64@1.1.0":
755-
version "1.1.0"
756-
resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-1.1.0.tgz#9402ecadfaf0383bc366ef5b37b933e0d0e804fc"
757-
integrity sha512-/dnpkjqnl2Qrcy+qFerOe+lV9QZ2HoUHtTplQgRxa+OH8AtQ7mcopdJ9/3Y10GqgT2Kp+AR6G99R59/Si+BOMg==
754+
"@bazel/bazel-darwin_x64@1.2.0":
755+
version "1.2.0"
756+
resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-1.2.0.tgz#e29840c263e0ebb9286bec9fa285907c9161f890"
757+
integrity sha512-3th94yNeqNdmzYhUlUeGWx8XEgE9UEh/1TBsG69QOPnYw4I1MYztfAa1iYXREs7qbvQP2R260tRaNhnwg2x6JQ==
758758

759-
"@bazel/bazel-linux_x64@1.1.0":
760-
version "1.1.0"
761-
resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-1.1.0.tgz#98d75240e3e9ff5ba14fa48d6241d5d741e89926"
762-
integrity sha512-yDR1URphRQTkXYjl4U2NLmbGR8ar8imhytK3txZZqlPf5pfWI/7wa7gSg0H4VbRRLIGAy/nD2eXZpgSj1eUiqA==
759+
"@bazel/bazel-linux_x64@1.2.0":
760+
version "1.2.0"
761+
resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-1.2.0.tgz#da4f4036c38638d8d49c77c16e21f6f6bae1be06"
762+
integrity sha512-pEFEu1mkqFcpKBkjlFbMwWj0J+f+e54EmJrOheNCneRi5ArZLBdHtGaxcWr27VMMR99qZM656R8NXXelOmhCqA==
763763

764-
"@bazel/bazel-win32_x64@1.1.0":
765-
version "1.1.0"
766-
resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-1.1.0.tgz#e9c80a8c6495834ee7fc6184c425284d1151ac38"
767-
integrity sha512-mj3ujcifKO+hjAjHvLoutYxzs90YWuc/fYJuVaEQrk4YFrRW5g70OpjN74zzBHRstObOjSZ3cOj+HDB19SIFKw==
764+
"@bazel/bazel-win32_x64@1.2.0":
765+
version "1.2.0"
766+
resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-1.2.0.tgz#1b0cf50fa4ec77e438d0ccf9550ac71a6c285f09"
767+
integrity sha512-fl/eKtWSW1fJIhyGD99p0c0GFv2L4019YFftmv5UBIu2Thb9wYZKQqLVyDBVe8D+Vz2tW6LpefCb+VcmiweJ8A==
768768

769-
"@bazel/bazel@1.1.0":
770-
version "1.1.0"
771-
resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-1.1.0.tgz#9ce8308e44d76132812e908fcbc9e9051c7c2e1a"
772-
integrity sha512-3NOWRHG1i/tAVQWuStIUuliFLVfjcKMbqIlc2Q206VWQ5pjlKgo0qa+qrWb0G6BYq+N3hxT4IwBz+Z17A8dbbg==
769+
"@bazel/bazel@1.2.0":
770+
version "1.2.0"
771+
resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-1.2.0.tgz#3aa126823c7c880fb09afe1fadfdb457f6b99531"
772+
integrity sha512-+NDzRxFpYBhdCbTiCMVK9dPXWqIBLMCXH1qq28Edy7xDMoP/J0gWITh8reMBwzDte/qC5ZAq6WjRDX75hWLUog==
773773
dependencies:
774774
"@bazel/hide-bazel-files" latest
775775
optionalDependencies:
776-
"@bazel/bazel-darwin_x64" "1.1.0"
777-
"@bazel/bazel-linux_x64" "1.1.0"
778-
"@bazel/bazel-win32_x64" "1.1.0"
776+
"@bazel/bazel-darwin_x64" "1.2.0"
777+
"@bazel/bazel-linux_x64" "1.2.0"
778+
"@bazel/bazel-win32_x64" "1.2.0"
779779

780780
781781
version "0.29.0"

0 commit comments

Comments
 (0)