From afddce8cc9e7b36b978781c7b526530e5ce8559c Mon Sep 17 00:00:00 2001 From: Sandy Zhang Date: Wed, 14 Dec 2022 14:10:12 -0800 Subject: [PATCH] Add -y to collect_all_artifacts apt install for `gnupg ca-certificates` PiperOrigin-RevId: 495412826 --- kokoro/release/collect_all_artifacts.sh | 2 +- src/file_lists.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kokoro/release/collect_all_artifacts.sh b/kokoro/release/collect_all_artifacts.sh index ad12504978..0f2e803307 100755 --- a/kokoro/release/collect_all_artifacts.sh +++ b/kokoro/release/collect_all_artifacts.sh @@ -50,7 +50,7 @@ cp ${INPUT_ARTIFACTS_DIR}/build64/src/protoc protoc/macosx_x64/protoc # Install nuget (will also install mono) # TODO(jtattermusch): use "mono:5.14" docker image instead so we don't have to apt-get install sudo apt update -sudo apt install gnupg ca-certificates +sudo apt install -y gnupg ca-certificates sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list sudo apt update diff --git a/src/file_lists.cmake b/src/file_lists.cmake index 9faaf62226..b7367effb6 100644 --- a/src/file_lists.cmake +++ b/src/file_lists.cmake @@ -168,8 +168,8 @@ set(libprotobuf_hdrs ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_ops.h ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_field.h ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_ptr_field.h - ${protobuf_SOURCE_DIR}/src/google/protobuf/serial_arena.h ${protobuf_SOURCE_DIR}/src/google/protobuf/service.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/serial_arena.h ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/callback.h ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/common.h ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/logging.h