mirror of
https://github.com/google/googletest.git
synced 2026-09-25 04:09:59 +03:00
Update GoogleTest dependencies in preparation for release
PiperOrigin-RevId: 959806818 Change-Id: I1504c832eba1d5fb9f99c21d16b269897c40aea0
This commit is contained in:
committed by
Copybara-Service
parent
c5a47cc5bd
commit
b607d9f590
+5
-6
@@ -41,25 +41,24 @@ module(
|
|||||||
|
|
||||||
bazel_dep(
|
bazel_dep(
|
||||||
name = "abseil-cpp",
|
name = "abseil-cpp",
|
||||||
version = "20260107.0",
|
version = "20260526.0",
|
||||||
)
|
)
|
||||||
bazel_dep(
|
bazel_dep(
|
||||||
name = "platforms",
|
name = "platforms",
|
||||||
version = "0.0.11",
|
version = "1.1.0",
|
||||||
)
|
)
|
||||||
bazel_dep(
|
bazel_dep(
|
||||||
name = "re2",
|
name = "re2",
|
||||||
version = "2025-11-05.bcr.1",
|
version = "2025-11-05.bcr.1",
|
||||||
)
|
)
|
||||||
|
|
||||||
bazel_dep(
|
bazel_dep(
|
||||||
name = "rules_cc",
|
name = "rules_cc",
|
||||||
version = "0.2.8"
|
version = "0.2.22",
|
||||||
)
|
)
|
||||||
|
|
||||||
bazel_dep(
|
bazel_dep(
|
||||||
name = "rules_python",
|
name = "rules_python",
|
||||||
version = "1.3.0",
|
version = "2.2.0",
|
||||||
dev_dependency = True,
|
dev_dependency = True,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -72,7 +71,7 @@ python = use_extension(
|
|||||||
python.toolchain(
|
python.toolchain(
|
||||||
ignore_root_user_error = True,
|
ignore_root_user_error = True,
|
||||||
is_default = True,
|
is_default = True,
|
||||||
python_version = "3.12",
|
python_version = "3.13",
|
||||||
)
|
)
|
||||||
|
|
||||||
# See fake_fuchsia_sdk.bzl for instructions on how to override this with a real SDK, if needed.
|
# See fake_fuchsia_sdk.bzl for instructions on how to override this with a real SDK, if needed.
|
||||||
|
|||||||
@@ -31,31 +31,36 @@
|
|||||||
workspace(name = "googletest")
|
workspace(name = "googletest")
|
||||||
|
|
||||||
load("//:googletest_deps.bzl", "googletest_deps")
|
load("//:googletest_deps.bzl", "googletest_deps")
|
||||||
|
|
||||||
googletest_deps()
|
googletest_deps()
|
||||||
|
|
||||||
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
|
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
|
||||||
|
|
||||||
http_archive(
|
http_archive(
|
||||||
name = "rules_python",
|
name = "rules_python",
|
||||||
sha256 = "2cc26bbd53854ceb76dd42a834b1002cd4ba7f8df35440cf03482e045affc244",
|
sha256 = "e11d2e1efce1589e5bdfa93986712c74fc7467a0f093143d489d2ef5ebb1ed2a",
|
||||||
strip_prefix = "rules_python-1.3.0",
|
strip_prefix = "rules_python-2.2.0",
|
||||||
url = "https://github.com/bazelbuild/rules_python/releases/download/1.3.0/rules_python-1.3.0.tar.gz",
|
url = "https://github.com/bazelbuild/rules_python/releases/download/2.2.0/rules_python-2.2.0.tar.gz",
|
||||||
)
|
)
|
||||||
|
|
||||||
# https://github.com/bazelbuild/rules_python/releases/tag/1.1.0
|
# https://github.com/bazelbuild/rules_python/releases/tag/1.1.0
|
||||||
load("@rules_python//python:repositories.bzl", "py_repositories")
|
load("@rules_python//python:repositories.bzl", "py_repositories")
|
||||||
|
|
||||||
py_repositories()
|
py_repositories()
|
||||||
|
|
||||||
http_archive(
|
http_archive(
|
||||||
name = "platforms",
|
name = "platforms",
|
||||||
|
sha256 = "dbad4a23abcca6171e47b79edc53bd6a41067a3b75f9e8b104656b459ff25046",
|
||||||
urls = [
|
urls = [
|
||||||
"https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.11/platforms-0.0.11.tar.gz",
|
"https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/1.1.0/platforms-1.1.0.tar.gz",
|
||||||
"https://github.com/bazelbuild/platforms/releases/download/0.0.11/platforms-0.0.11.tar.gz",
|
"https://github.com/bazelbuild/platforms/releases/download/1.1.0/platforms-1.1.0.tar.gz",
|
||||||
],
|
],
|
||||||
sha256 = "29742e87275809b5e598dc2f04d86960cc7a55b3067d97221c9abbc9926bff0f",
|
|
||||||
)
|
)
|
||||||
|
|
||||||
load("@bazel_features//:deps.bzl", "bazel_features_deps")
|
load("@bazel_features//:deps.bzl", "bazel_features_deps")
|
||||||
|
|
||||||
bazel_features_deps()
|
bazel_features_deps()
|
||||||
|
|
||||||
load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
|
load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
|
||||||
|
|
||||||
compatibility_proxy_repo()
|
compatibility_proxy_repo()
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
set -euox pipefail
|
set -euox pipefail
|
||||||
|
|
||||||
readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20260131"
|
readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest@sha256:baa99e65a3cc837bab8e5246f1870d25c76d0adf2b1d598ee5a3ec77fd2e19bd"
|
||||||
|
|
||||||
if [[ -z ${GTEST_ROOT:-} ]]; then
|
if [[ -z ${GTEST_ROOT:-} ]]; then
|
||||||
GTEST_ROOT="$(realpath $(dirname ${0})/..)"
|
GTEST_ROOT="$(realpath $(dirname ${0})/..)"
|
||||||
@@ -98,9 +98,9 @@ time docker run \
|
|||||||
--volume="${GTEST_ROOT}:/src:ro" \
|
--volume="${GTEST_ROOT}:/src:ro" \
|
||||||
--workdir="/src" \
|
--workdir="/src" \
|
||||||
--rm \
|
--rm \
|
||||||
--env="CC=/opt/gcc-9/bin/gcc" \
|
--env="CC=/opt/gcc-10/bin/gcc" \
|
||||||
--env="BAZEL_CXXOPTS=-std=c++17" \
|
--env="BAZEL_CXXOPTS=-std=c++17" \
|
||||||
--env="BAZEL_LINKOPTS=-L/opt/gcc-9/lib64:-Wl,-rpath=/opt/gcc-9/lib64" \
|
--env="BAZEL_LINKOPTS=-L/opt/gcc-10/lib64:-Wl,-rpath=/opt/gcc-10/lib64" \
|
||||||
--env="USE_BAZEL_VERSION=8.5.1" \
|
--env="USE_BAZEL_VERSION=8.5.1" \
|
||||||
${DOCKER_EXTRA_ARGS:-} \
|
${DOCKER_EXTRA_ARGS:-} \
|
||||||
${LINUX_LATEST_CONTAINER} \
|
${LINUX_LATEST_CONTAINER} \
|
||||||
@@ -129,7 +129,7 @@ for std in ${STD}; do
|
|||||||
--rm \
|
--rm \
|
||||||
--env="CC=/usr/local/bin/gcc" \
|
--env="CC=/usr/local/bin/gcc" \
|
||||||
--env="BAZEL_CXXOPTS=-std=${std}" \
|
--env="BAZEL_CXXOPTS=-std=${std}" \
|
||||||
--env="USE_BAZEL_VERSION=9.0.0" \
|
--env="USE_BAZEL_VERSION=9.1.0" \
|
||||||
${DOCKER_EXTRA_ARGS:-} \
|
${DOCKER_EXTRA_ARGS:-} \
|
||||||
${LINUX_LATEST_CONTAINER} \
|
${LINUX_LATEST_CONTAINER} \
|
||||||
/bin/bash --login -c "
|
/bin/bash --login -c "
|
||||||
@@ -158,7 +158,7 @@ for std in ${STD}; do
|
|||||||
--rm \
|
--rm \
|
||||||
--env="CC=/opt/llvm/bin/clang" \
|
--env="CC=/opt/llvm/bin/clang" \
|
||||||
--env="BAZEL_CXXOPTS=-std=${std}" \
|
--env="BAZEL_CXXOPTS=-std=${std}" \
|
||||||
--env="USE_BAZEL_VERSION=9.0.0" \
|
--env="USE_BAZEL_VERSION=9.1.0" \
|
||||||
${DOCKER_EXTRA_ARGS:-} \
|
${DOCKER_EXTRA_ARGS:-} \
|
||||||
${LINUX_LATEST_CONTAINER} \
|
${LINUX_LATEST_CONTAINER} \
|
||||||
/bin/bash --login -c "
|
/bin/bash --login -c "
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ done
|
|||||||
# Test the Bazel build
|
# Test the Bazel build
|
||||||
|
|
||||||
# If we are running on Kokoro, check for a versioned Bazel binary.
|
# If we are running on Kokoro, check for a versioned Bazel binary.
|
||||||
KOKORO_GFILE_BAZEL_BIN="bazel-9.0.0-darwin-x86_64"
|
KOKORO_GFILE_BAZEL_BIN="bazel-9.1.0-darwin-x86_64"
|
||||||
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f ${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN} ]]; then
|
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f ${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN} ]]; then
|
||||||
BAZEL_BIN="${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN}"
|
BAZEL_BIN="${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN}"
|
||||||
chmod +x ${BAZEL_BIN}
|
chmod +x ${BAZEL_BIN}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
SETLOCAL ENABLEDELAYEDEXPANSION
|
SETLOCAL ENABLEDELAYEDEXPANSION
|
||||||
|
|
||||||
SET BAZEL_EXE=%KOKORO_GFILE_DIR%\bazel-9.0.0-windows-x86_64.exe
|
SET BAZEL_EXE=%KOKORO_GFILE_DIR%\bazel-9.1.0-windows-x86_64.exe
|
||||||
|
|
||||||
SET PATH=C:\Python34;%PATH%
|
SET PATH=C:\Python34;%PATH%
|
||||||
SET BAZEL_PYTHON=C:\python34\python.exe
|
SET BAZEL_PYTHON=C:\python34\python.exe
|
||||||
|
|||||||
Reference in New Issue
Block a user