From cc6bc34c8cdc8aa0e37764d2ae219a932024f1ca Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Wed, 9 Mar 2022 09:37:58 -0800 Subject: [PATCH] Update protobuf submodule (#10801) --- cgmanifests/generated/cgmanifest.json | 2 +- cmake/external/protobuf | 2 +- .../inference/x86_64/default/cpu/scripts/install_deps.sh | 6 +++--- .../github/linux/docker/scripts/install_protobuf.sh | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json index 817fa0881f..9a2dd64722 100644 --- a/cgmanifests/generated/cgmanifest.json +++ b/cgmanifests/generated/cgmanifest.json @@ -334,7 +334,7 @@ "component": { "type": "git", "git": { - "commitHash": "2dc747c574b68a808ea4699d26942c8132fe2b09", + "commitHash": "0dab03ba7bc438d7ba3eac2b2c1eb39ed520f928", "repositoryUrl": "https://github.com/protocolbuffers/protobuf.git" }, "comments": "git submodule at cmake/external/protobuf" diff --git a/cmake/external/protobuf b/cmake/external/protobuf index 2dc747c574..0dab03ba7b 160000 --- a/cmake/external/protobuf +++ b/cmake/external/protobuf @@ -1 +1 @@ -Subproject commit 2dc747c574b68a808ea4699d26942c8132fe2b09 +Subproject commit 0dab03ba7bc438d7ba3eac2b2c1eb39ed520f928 diff --git a/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/scripts/install_deps.sh b/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/scripts/install_deps.sh index f5cda2904e..801e861684 100755 --- a/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/scripts/install_deps.sh +++ b/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/scripts/install_deps.sh @@ -82,9 +82,9 @@ unzip /tmp/src/gradle-6.3-bin.zip mv /tmp/src/gradle-6.3 /usr/local/gradle if ! [ -x "$(command -v protoc)" ]; then - GetFile https://github.com/protocolbuffers/protobuf/archive/v3.16.0.tar.gz /tmp/src/v3.16.0.tar.gz - tar -xf /tmp/src/v3.16.0.tar.gz -C /tmp/src - cd /tmp/src/protobuf-3.16.0 + GetFile https://github.com/protocolbuffers/protobuf/archive/v3.18.1.tar.gz /tmp/src/v3.18.1.tar.gz + tar -xf /tmp/src/v3.18.1.tar.gz -C /tmp/src + cd /tmp/src/protobuf-3.18.1 cmake ./cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_POSITION_INDEPENDENT_CODE=ON -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Relwithdebinfo -DCMAKE_INSTALL_LIBDIR=lib64 make -j$(getconf _NPROCESSORS_ONLN) make install diff --git a/tools/ci_build/github/linux/docker/scripts/install_protobuf.sh b/tools/ci_build/github/linux/docker/scripts/install_protobuf.sh index 1831ea22fc..dff4d2e282 100755 --- a/tools/ci_build/github/linux/docker/scripts/install_protobuf.sh +++ b/tools/ci_build/github/linux/docker/scripts/install_protobuf.sh @@ -34,9 +34,9 @@ function GetFile { return $? } -GetFile https://github.com/protocolbuffers/protobuf/archive/v3.16.0.tar.gz /tmp/src/v3.16.0.tar.gz -tar -xf /tmp/src/v3.16.0.tar.gz -C /tmp/src -cd /tmp/src/protobuf-3.16.0 +GetFile https://github.com/protocolbuffers/protobuf/archive/v3.18.1.tar.gz /tmp/src/v3.18.1.tar.gz +tar -xf /tmp/src/v3.18.1.tar.gz -C /tmp/src +cd /tmp/src/protobuf-3.18.1 cmake ./cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_POSITION_INDEPENDENT_CODE=ON -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Relwithdebinfo make -j$(getconf _NPROCESSORS_ONLN) make install