diff options
| author | Bill Richardson <wfrichar@google.com> | 2019-01-25 12:27:46 -0800 |
|---|---|---|
| committer | Bill Richardson <wfrichar@google.com> | 2019-01-25 16:43:57 -0800 |
| commit | 4ba925665d5d4b5e9c682653e5aa9c5f8cacffcf (patch) | |
| tree | ca64d80f51f2544d9b20866f5413297e021dbb5d | |
| parent | 1f2172f4252b82f91a3bb148d06291ccef1cf859 (diff) | |
| parent | ed9f7a1613dc78bf7dd93aedebe610882cf399d1 (diff) | |
| download | system-test-harness-4ba925665d5d4b5e9c682653e5aa9c5f8cacffcf.tar.gz | |
Merge remote-tracking branch 'goog/upstream-master' into bill-nos-merge-upstream
* goog/upstream-master:
test/system-test-harness: Upgrade googletest to 1.8.1
WORKSPACE: Roll protobuf to latest point release
Quick hack to fix bazel
Bug: 78508518
Test: manual
Change-Id: I1785d7495bd66d187954272cc02a3d450e370278
Signed-off-by: Bill Richardson <wfrichar@google.com>
| l--------- | BUILD.gtest | 1 | ||||
| -rw-r--r-- | WORKSPACE | 23 |
2 files changed, 13 insertions, 11 deletions
diff --git a/BUILD.gtest b/BUILD.gtest new file mode 120000 index 0000000..fc79edf --- /dev/null +++ b/BUILD.gtest @@ -0,0 +1 @@ +../../core/nugget/BUILD.gtest
\ No newline at end of file @@ -1,25 +1,26 @@ workspace(name = "nugget_test_systemtestharness") -new_http_archive( +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + +http_archive( name = "gtest", - url = "https://github.com/google/googletest/archive/release-1.8.0.zip", - build_file = "../../core/nugget/BUILD.gtest", - sha256 = "f3ed3b58511efd272eb074a3a6d6fb79d7c2e6a0e374323d1e6bcbcc1ef141bf", - strip_prefix = "googletest-release-1.8.0", + url = "https://github.com/google/googletest/archive/release-1.8.1.zip", + sha256 = "927827c183d01734cc5cfef85e0ff3f5a92ffe6188e0d18e909c5efebf28a0c7", + strip_prefix = "googletest-release-1.8.1", ) http_archive( name = "com_google_protobuf", - url = "https://github.com/google/protobuf/archive/v3.5.0.zip", - strip_prefix = "protobuf-3.5.0", - sha256 = "cef7f1b5a7c5fba672bec2a319246e8feba471f04dcebfe362d55930ee7c1c30", + url = "https://github.com/google/protobuf/archive/v3.6.1.2.zip", + strip_prefix = "protobuf-3.6.1.2", + sha256 = "d6618d117698132dadf0f830b762315807dc424ba36ab9183f1f436008a2fdb6", ) http_archive( name = "com_google_protobuf_cc", - url = "https://github.com/google/protobuf/archive/v3.5.0.zip", - strip_prefix = "protobuf-3.5.0", - sha256 = "cef7f1b5a7c5fba672bec2a319246e8feba471f04dcebfe362d55930ee7c1c30", + url = "https://github.com/google/protobuf/archive/v3.6.1.2.zip", + strip_prefix = "protobuf-3.6.1.2", + sha256 = "d6618d117698132dadf0f830b762315807dc424ba36ab9183f1f436008a2fdb6", ) http_archive( |