Chiebot-Mirror
/
protobuf
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Automated rollback of commit 4dc164884c.

Browse Source 
PiperOrigin-RevId: 642058565
pull/17073/head
Protobuf Team Bot 10 months ago committed by Copybara-Service
parent ba8a9744f2
commit 4a5660c889
10 changed files with 46 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .github/workflows/test_bazel.yml
  2. 14
      .github/workflows/test_cpp.yml
  3. 2
      .github/workflows/test_upb.yml
  4. 2
      .readthedocs.yml
  5. 2
      MODULE.bazel
  6. 10
      WORKSPACE
  7. 8
      protobuf_deps.bzl
  8. 12
      python/dist/system_python.bzl
  9. 38
      third_party/rules_fuzzing.patch
  10. 14
      toolchain/BUILD.bazel

2
.github/workflows/test_bazel.yml
Unescape View File

@ -17,7 +17,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
runner: [ ubuntu, windows, macos ] runner: [ ubuntu, windows, macos ]
bazelversion: [ '7.1.1' ] bazelversion: [ '7.1.2' ]
bzlmod: [true, false ] bzlmod: [true, false ]
include: include:
- runner: ubuntu - runner: ubuntu

14
.github/workflows/test_cpp.yml
Unescape View File

@ -26,19 +26,19 @@ jobs:
- { name: No-RTTI, flags: --cxxopt=-fno-rtti } - { name: No-RTTI, flags: --cxxopt=-fno-rtti }
include: include:
# Set defaults # Set defaults
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/sanitize@sha256:04cd765285bc52cbbf51d66c8c66d8603579cf0f19cc42df26b09d2c270541fb - image: us-docker.pkg.dev/protobuf-build/containers/test/linux/sanitize@sha256:3d959f731dc5c54af4865c31ee2bd581ec40028adcdf4c038f3122581f595191
- targets: //pkg/... //src/... @com_google_protobuf_examples//... //third_party/utf8_range/... - targets: //pkg/... //src/... @com_google_protobuf_examples//... //third_party/utf8_range/...
# Override cases with custom images # Override cases with custom images
- config: { name: "Bazel7" } - config: { name: "Bazel7" }
image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.1-75f2a85ece6526cc3d54087018c0f1097d78d42b" image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-cf84e92285ca133b9c8104ad7b14d70e953cbb8e"
targets: "//src/... //third_party/utf8_range/..." targets: "//src/... //third_party/utf8_range/..."
- config: { name: "TCMalloc" } - config: { name: "TCMalloc" }
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/tcmalloc@sha256:bd39119d74b8a3fad4ae335d4cf5294e70384676331b7e19949459fc7a8d8328" image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/tcmalloc@sha256:1c5133455481f4d1bb8afa477029604f41f1a3c46cebe4d9958cf1af95b5c87c"
targets: "//src/... //third_party/utf8_range/..." targets: "//src/... //third_party/utf8_range/..."
- config: { name: "aarch64" } - config: { name: "aarch64" }
targets: "//src/... //src/google/protobuf/compiler:protoc_aarch64_test //third_party/utf8_range/..." targets: "//src/... //src/google/protobuf/compiler:protoc_aarch64_test //third_party/utf8_range/..."
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-63dd26c0c7a808d92673a3e52e848189d4ab0f17" image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:6.3.0-aarch64-68e662b3a56b881804dc4e9d45f949791cbc4b94"
name: Linux ${{ matrix.config.name }} name: Linux ${{ matrix.config.name }}
runs-on: ${{ matrix.config.runner || 'ubuntu-latest' }} runs-on: ${{ matrix.config.runner || 'ubuntu-latest' }}
steps: steps:
@ -102,7 +102,7 @@ jobs:
- name: Run tests - name: Run tests
uses: protocolbuffers/protobuf-ci/docker@v3 uses: protocolbuffers/protobuf-ci/docker@v3
with: with:
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:${{ matrix.arch }}-63dd26c0c7a808d92673a3e52e848189d4ab0f17 image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:${{ matrix.arch }}-384d5abe83a791c6b1ce04f5d7bc0b1f84a30d38
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
entrypoint: bash entrypoint: bash
command: > command: >
@ -328,7 +328,7 @@ jobs:
os: macos-12 os: macos-12
cache_key: macos-12-bazel7 cache_key: macos-12-bazel7
bazel: test //src/... //third_party/utf8_range/... bazel: test //src/... //third_party/utf8_range/...
bazel_version: '7.1.1' bazel_version: '7.1.2'
- name: MacOS Apple Silicon (build only) Bazel - name: MacOS Apple Silicon (build only) Bazel
os: macos-12 os: macos-12
cache_key: macos-12-arm cache_key: macos-12-arm
@ -343,7 +343,7 @@ jobs:
os: windows-2022 os: windows-2022
cache_key: windows-2022-bazel7 cache_key: windows-2022-bazel7
bazel: test //src/... @com_google_protobuf_examples//... --test_tag_filters=-conformance --build_tag_filters=-conformance bazel: test //src/... @com_google_protobuf_examples//... --test_tag_filters=-conformance --build_tag_filters=-conformance
bazel_version: '7.1.1' bazel_version: '7.1.2'
name: ${{ matrix.name }} name: ${{ matrix.name }}
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:

2
.github/workflows/test_upb.yml
Unescape View File

@ -144,7 +144,7 @@ jobs:
- name: Build Wheels - name: Build Wheels
uses: protocolbuffers/protobuf-ci/bazel-docker@v3 uses: protocolbuffers/protobuf-ci/bazel-docker@v3
with: with:
image: us-docker.pkg.dev/protobuf-build/release-containers/linux/apple@sha256:b3dc9b75d8e599b0e95ed245d89f44b5a4231112f975da89dd02006a484a58df image: us-docker.pkg.dev/protobuf-build/release-containers/linux/apple:6.3.0-53225851b051e66f8543e972c143f35be757a181
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
bazel-cache: upb-bazel-python bazel-cache: upb-bazel-python
bazel: build --crosstool_top=//toolchain:clang_suite --//toolchain:release=true --symlink_prefix=/ -c dbg //python/dist //python/dist:test_wheel //python/dist:source_wheel bazel: build --crosstool_top=//toolchain:clang_suite --//toolchain:release=true --symlink_prefix=/ -c dbg //python/dist //python/dist:test_wheel //python/dist:source_wheel

2
.readthedocs.yml
Unescape View File

@ -16,7 +16,7 @@ conda:
environment: python/docs/environment.yml environment: python/docs/environment.yml
python: python:
version: 3.7 version: 3.8
install: install:
- method: setuptools - method: setuptools
path: python path: python

2
MODULE.bazel
Unescape View File

@ -20,7 +20,7 @@ bazel_dep(name = "rules_fuzzing", version = "0.5.2")
bazel_dep(name = "rules_java", version = "5.3.5") bazel_dep(name = "rules_java", version = "5.3.5")
bazel_dep(name = "rules_jvm_external", version = "5.1") bazel_dep(name = "rules_jvm_external", version = "5.1")
bazel_dep(name = "rules_pkg", version = "0.7.0") bazel_dep(name = "rules_pkg", version = "0.7.0")
bazel_dep(name = "rules_python", version = "0.10.2") bazel_dep(name = "rules_python", version = "0.28.0")
bazel_dep(name = "rules_rust", version = "0.45.1") bazel_dep(name = "rules_rust", version = "0.45.1")
bazel_dep(name = "platforms", version = "0.0.8") bazel_dep(name = "platforms", version = "0.0.8")
bazel_dep(name = "zlib", version = "1.2.11") bazel_dep(name = "zlib", version = "1.2.11")

10
WORKSPACE
Unescape View File

@ -25,6 +25,10 @@ load("@rules_python//python:repositories.bzl", "py_repositories")
py_repositories() py_repositories()
load("@rules_python//python/pip_install:repositories.bzl", "pip_install_dependencies")
pip_install_dependencies()
# Bazel platform rules. # Bazel platform rules.
http_archive( http_archive(
name = "platforms", name = "platforms",
@ -177,9 +181,9 @@ install_deps()
http_archive( http_archive(
name = "rules_fuzzing", name = "rules_fuzzing",
sha256 = "ff52ef4845ab00e95d29c02a9e32e9eff4e0a4c9c8a6bcf8407a2f19eb3f9190", sha256 = "77206c54b71f4dd5335123a6ff2a8ea688eca5378d34b4838114dff71652cf26",
strip_prefix = "rules_fuzzing-0.4.1", strip_prefix = "rules_fuzzing-0.5.1",
urls = ["https://github.com/bazelbuild/rules_fuzzing/releases/download/v0.4.1/rules_fuzzing-0.4.1.zip"], urls = ["https://github.com/bazelbuild/rules_fuzzing/releases/download/v0.5.1/rules_fuzzing-0.5.1.zip"],
patches = ["//third_party:rules_fuzzing.patch"], patches = ["//third_party:rules_fuzzing.patch"],
patch_args = ["-p1"], patch_args = ["-p1"],
) )

8
protobuf_deps.bzl
Unescape View File

@ -100,15 +100,15 @@ def protobuf_deps():
if not native.existing_rule("rules_python"): if not native.existing_rule("rules_python"):
http_archive( http_archive(
name = "rules_python", name = "rules_python",
sha256 = "9d04041ac92a0985e344235f5d946f71ac543f1b1565f2cdbc9a2aaee8adf55b", sha256 = "d70cd72a7a4880f0000a6346253414825c19cdd40a28289bdf67b8e6480edff8",
strip_prefix = "rules_python-0.26.0", strip_prefix = "rules_python-0.28.0",
url = "https://github.com/bazelbuild/rules_python/releases/download/0.26.0/rules_python-0.26.0.tar.gz", url = "https://github.com/bazelbuild/rules_python/releases/download/0.28.0/rules_python-0.28.0.tar.gz",
) )
if not native.existing_rule("system_python"): if not native.existing_rule("system_python"):
system_python( system_python(
name = "system_python", name = "system_python",
minimum_python_version = "3.7", minimum_python_version = "3.8",
) )
if not native.existing_rule("rules_jvm_external"): if not native.existing_rule("rules_jvm_external"):

12
python/dist/system_python.bzl vendored
Unescape View File

@ -36,7 +36,7 @@ pip_parse = pip_install
# Alias rules_python's pip.bzl for cases where a system python is found. # Alias rules_python's pip.bzl for cases where a system python is found.
_alias_pip = """ _alias_pip = """
load("@rules_python//python:pip.bzl", _pip_install = "pip_install", _pip_parse = "pip_parse") load("@rules_python//python:pip.bzl", _pip_parse = "pip_parse")
def _get_requirements(requirements, requirements_overrides): def _get_requirements(requirements, requirements_overrides):
for version, override in requirements_overrides.items(): for version, override in requirements_overrides.items():
@ -45,18 +45,14 @@ def _get_requirements(requirements, requirements_overrides):
break break
return requirements return requirements
def pip_install(requirements, requirements_overrides={{}}, **kwargs):
_pip_install(
python_interpreter_target = "@{repo}//:interpreter",
requirements = _get_requirements(requirements, requirements_overrides),
**kwargs,
)
def pip_parse(requirements, requirements_overrides={{}}, **kwargs): def pip_parse(requirements, requirements_overrides={{}}, **kwargs):
_pip_parse( _pip_parse(
python_interpreter_target = "@{repo}//:interpreter", python_interpreter_target = "@{repo}//:interpreter",
requirements = _get_requirements(requirements, requirements_overrides), requirements_lock = _get_requirements(requirements, requirements_overrides),
**kwargs, **kwargs,
) )
pip_install = pip_parse
""" """
_mock_fuzzing_py = """ _mock_fuzzing_py = """

38
third_party/rules_fuzzing.patch vendored
Unescape View File

@ -1,25 +1,13 @@
diff --git a/fuzzing/tools/validate_dict.py b/fuzzing/tools/validate_dict.py diff --git a/fuzzing/private/binary.bzl b/fuzzing/private/binary.bzl
index d561e68..52cbcb8 100644 index 4c85aed..8ff9723 100644
--- a/fuzzing/tools/validate_dict.py --- a/fuzzing/private/binary.bzl
+++ b/fuzzing/tools/validate_dict.py +++ b/fuzzing/private/binary.bzl
@@ -19,7 +19,7 @@ Validates and merges a set of fuzzing dictionary files into a single output. @@ -114,7 +114,7 @@ def _fuzzing_binary_impl(ctx):
else:
from absl import app default_info = ctx.attr.binary[DefaultInfo]
from absl import flags binary_runfiles = default_info.default_runfiles
-from dict_validation import validate_line - binary_repo_mapping_manifest = getattr(default_info.files_to_run, "repo_mapping_manifest")
+from fuzzing.tools.dict_validation import validate_line + binary_repo_mapping_manifest = getattr(default_info.files_to_run, "repo_mapping_manifest", None)
from sys import stderr other_runfiles = []
if ctx.file.corpus:
FLAGS = flags.FLAGS other_runfiles.append(ctx.file.corpus)
diff --git a/fuzzing/requirements.txt b/fuzzing/requirements.txt
index 01482d4..4b36f4f 100644
--- a/fuzzing/requirements.txt
+++ b/fuzzing/requirements.txt
@@ -1,5 +1,5 @@
# Python requirements for the tools supporting the fuzzing rules. These are
# installed automatically through the WORKSPACE configuration.
-absl-py==0.11.0 --hash=sha256:b3d9eb5119ff6e0a0125f6dabf2f9fae02f8acae7be70576002fac27235611c5
-six==1.15.0 --hash=sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced
+absl-py==2.0.0 --hash=sha256:9a28abb62774ae4e8edbe2dd4c49ffcd45a6a848952a5eccc6a49f3f0fc1e2f3
+six==1.16.0 --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254

14
toolchain/BUILD.bazel
Unescape View File

@ -131,13 +131,13 @@ cc_toolchain_config(
cc_toolchain_config( cc_toolchain_config(
name = "win32-config", name = "win32-config",
extra_compiler_flags = [ extra_compiler_flags = [
"-isystem/usr/lib/gcc/i686-w64-mingw32/8.3-posix/include/c++", "-isystem/usr/lib/gcc/i686-w64-mingw32/10-posix/include/c++",
"-isystem/usr/lib/gcc/i686-w64-mingw32/8.3-posix/include/c++/i686-w64-mingw32", "-isystem/usr/lib/gcc/i686-w64-mingw32/10-posix/include/c++/i686-w64-mingw32",
"-fsjlj-exceptions", "-fsjlj-exceptions",
], ],
extra_include = "/usr/lib/gcc/i686-w64-mingw32", extra_include = "/usr/lib/gcc/i686-w64-mingw32",
extra_linker_flags = [ extra_linker_flags = [
"-L/usr/lib/gcc/i686-w64-mingw32/8.3-posix", "-L/usr/lib/gcc/i686-w64-mingw32/10-posix",
"-ldbghelp", "-ldbghelp",
"-pthread", "-pthread",
], ],
@ -150,12 +150,12 @@ cc_toolchain_config(
cc_toolchain_config( cc_toolchain_config(
name = "win64-config", name = "win64-config",
extra_compiler_flags = [ extra_compiler_flags = [
"-isystem/usr/lib/gcc/x86_64-w64-mingw32/8.3-posix/include/c++/", "-isystem/usr/lib/gcc/x86_64-w64-mingw32/10-posix/include/c++/",
"-isystem/usr/lib/gcc/x86_64-w64-mingw32/8.3-posix/include/c++/x86_64-w64-mingw32", "-isystem/usr/lib/gcc/x86_64-w64-mingw32/10-posix/include/c++/x86_64-w64-mingw32",
], ],
extra_include = "/usr/lib/gcc/x86_64-w64-mingw32/8.3-posix/include", extra_include = "/usr/lib/gcc/x86_64-w64-mingw32/10-posix/include",
extra_linker_flags = [ extra_linker_flags = [
"-L/usr/lib/gcc/x86_64-w64-mingw32/8.3-posix", "-L/usr/lib/gcc/x86_64-w64-mingw32/10-posix",
"-ldbghelp", "-ldbghelp",
], ],
linker_path = "/usr/bin/ld", linker_path = "/usr/bin/ld",

Write Preview
Loading…
Cancel
Save