From ecd98099f9cd77e61bb4e81d86f31a380c89edaa Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Thu, 5 Sep 2024 14:14:25 -0700 Subject: [PATCH 1/2] chore: add compatibility for Protobuf v4 --- CommonProtos/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CommonProtos/composer.json b/CommonProtos/composer.json index a70561b11852..620bc71c02f8 100644 --- a/CommonProtos/composer.json +++ b/CommonProtos/composer.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "require": { "php": "^8.0", - "google/protobuf": "^3.6.1" + "google/protobuf": "^v3.25.3||^4.26.1" }, "require-dev": { "phpunit/phpunit": "^9.6" From e488ea9fd25b5cdf3f9fc3b879dbbf6bed778588 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Thu, 5 Sep 2024 14:21:30 -0700 Subject: [PATCH 2/2] update gitattributes --- CommonProtos/.gitattributes | 6 +++--- CommonProtos/.gitignore | 12 ------------ 2 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 CommonProtos/.gitignore diff --git a/CommonProtos/.gitattributes b/CommonProtos/.gitattributes index d0b21161a7b4..4981b02e8a6c 100644 --- a/CommonProtos/.gitattributes +++ b/CommonProtos/.gitattributes @@ -1,6 +1,6 @@ +/*.xml.dist export-ignore +/.OwlBot.yaml export-ignore /.gitattributes export-ignore /.github export-ignore -/.gitignore export-ignore -/dev export-ignore +/owlbot.py export-ignore /tests export-ignore -/phpunit.xml.dist export-ignore diff --git a/CommonProtos/.gitignore b/CommonProtos/.gitignore deleted file mode 100644 index 7e3271eadd60..000000000000 --- a/CommonProtos/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ - -# Directories created when regenerating protos -out/ -tmp_common_protos/ - -# Composer related dirs -composer.lock -vendor/ - -# Doc generation dirs -tmp_gh-pages/ -cache/