diff options
| author | dmauro <dmauro@google.com> | 2021-05-25 14:50:59 -0400 |
|---|---|---|
| committer | Andy Soffer <asoffer@google.com> | 2021-06-02 17:54:36 -0400 |
| commit | 8ceecc27c7610b533a897cbb9896c0e24c7f1951 (patch) | |
| tree | d4d678894de18233c98ad7ac6283ebe25d508717 | |
| parent | a3460d1aeeaa43fdf137a6adefef10ba0b59fe4b (diff) | |
| download | googletest-git-8ceecc27c7610b533a897cbb9896c0e24c7f1951.tar.gz | |
Googletest export
Updates Linux docker image to use Bazel 4.1.0 and GCC 11.1
Updates Bazel dependencies
Removes the last usage of the deprecated and removed Python2
PiperOrigin-RevId: 375759184
| -rw-r--r-- | WORKSPACE | 30 | ||||
| -rw-r--r-- | ci/linux-presubmit.sh | 4 | ||||
| -rw-r--r-- | googlemock/test/BUILD.bazel | 1 |
3 files changed, 15 insertions, 20 deletions
@@ -3,28 +3,22 @@ workspace(name = "com_google_googletest") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( - name = "com_google_absl", # 2020-10-13T16:49:13Z - sha256 = "00c3707bf9cd5eabd1ec6932cc65b97378c043f22573be3adf7d11bb7af17d06", - strip_prefix = "abseil-cpp-f3f785ab59478dd0312bf1b5df65d380650bf0dc", - urls = [ - "https://github.com/abseil/abseil-cpp/archive/f3f785ab59478dd0312bf1b5df65d380650bf0dc.zip", - ], + name = "com_google_absl", + urls = ["https://github.com/abseil/abseil-cpp/archive/7971fb358ae376e016d2d4fc9327aad95659b25e.zip"], # 2021-05-20T02:59:16Z + strip_prefix = "abseil-cpp-7971fb358ae376e016d2d4fc9327aad95659b25e", + sha256 = "aeba534f7307e36fe084b452299e49b97420667a8d28102cf9a0daeed340b859", ) http_archive( - name = "rules_cc", # 2020-10-05T06:01:24Z - sha256 = "35ea62c63cd71d4000efe85f9f4f17e8afb23896c37ee9510952db2e9d8fbb70", - strip_prefix = "rules_cc-f055da4ff0cb2b3c73de1fe2f094ebdfb8b3acb9", - urls = [ - "https://github.com/bazelbuild/rules_cc/archive/f055da4ff0cb2b3c73de1fe2f094ebdfb8b3acb9.zip", - ], + name = "rules_cc", + urls = ["https://github.com/bazelbuild/rules_cc/archive/68cb652a71e7e7e2858c50593e5a9e3b94e5b9a9.zip"], # 2021-05-14T14:51:14Z + strip_prefix = "rules_cc-68cb652a71e7e7e2858c50593e5a9e3b94e5b9a9", + sha256 = "1e19e9a3bc3d4ee91d7fcad00653485ee6c798efbbf9588d40b34cbfbded143d", ) http_archive( - name = "rules_python", # 2020-09-30T13:50:21Z - sha256 = "6e49996ad3cf45b2232b8f94ca1e3ead369c28394c51632be8d85fe826383012", - strip_prefix = "rules_python-c064f7008a30f307ea7516cf52358a653011f82b", - urls = [ - "https://github.com/bazelbuild/rules_python/archive/c064f7008a30f307ea7516cf52358a653011f82b.zip", - ], + name = "rules_python", + urls = ["https://github.com/bazelbuild/rules_python/archive/ed6cc8f2c3692a6a7f013ff8bc185ba77eb9b4d2.zip"], # 2021-05-17T00:24:16Z + strip_prefix = "rules_python-ed6cc8f2c3692a6a7f013ff8bc185ba77eb9b4d2", + sha256 = "98b3c592faea9636ac8444bfd9de7f3fb4c60590932d6e6ac5946e3f8dbd5ff6", ) diff --git a/ci/linux-presubmit.sh b/ci/linux-presubmit.sh index d02130c3..6bea1cde 100644 --- a/ci/linux-presubmit.sh +++ b/ci/linux-presubmit.sh @@ -31,7 +31,7 @@ set -euox pipefail -readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20201008" +readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20210525" readonly LINUX_GCC_FLOOR_CONTAINER="gcr.io/google.com/absl-177019/linux_gcc-floor:20201015" if [[ -z ${GTEST_ROOT:-} ]]; then @@ -95,6 +95,7 @@ for std in ${STD}; do --copt="-Wall" \ --copt="-Werror" \ --define="absl=${absl}" \ + --distdir="/bazel-distdir" \ --keep_going \ --show_timestamps \ --test_output=errors @@ -116,6 +117,7 @@ for std in ${STD}; do --copt="-Wall" \ --copt="-Werror" \ --define="absl=${absl}" \ + --distdir="/bazel-distdir" \ --keep_going \ --linkopt="--gcc-toolchain=/usr/local" \ --show_timestamps \ diff --git a/googlemock/test/BUILD.bazel b/googlemock/test/BUILD.bazel index 1f7bd067..efb7306b 100644 --- a/googlemock/test/BUILD.bazel +++ b/googlemock/test/BUILD.bazel @@ -103,7 +103,6 @@ py_test( ":gmock_output_test_", ":gmock_output_test_golden.txt", ], - python_version = "PY2", tags = [ "no_test_msvc2015", "no_test_msvc2017", |