Skip to content

Upgrade to protobuf 33.1 #12534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kannanjgithub merged 25 commits into from
Dec 5, 2025
Merged

Upgrade to protobuf 33.1 #12534

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e249724
Upgrade to protobuf 33.1
kannanjgithub Nov 24, 2025
537d11a
Remove deleting abseil-cpp under protobuf as it doesn't exist anymore…
kannanjgithub Nov 24, 2025
fde9ebf
Use cpp 17
kannanjgithub Nov 24, 2025
7879dd5
Use c++ 17
kannanjgithub Nov 24, 2025
9888b79
Try force fetch protobuf deps because of the error "Could NOT find ab…
kannanjgithub Nov 24, 2025
7e6fdbf
Remove protobuf_FORCE_FETCH_DEPENDENCIES since it is downloading abse…
kannanjgithub Nov 25, 2025
df7cc5a
Build and install abseil separately before protobuf, in an attempt to…
kannanjgithub Nov 25, 2025
43d2478
Remove unwanted change
kannanjgithub Nov 25, 2025
81e7bc4
nit
kannanjgithub Nov 25, 2025
392a114
Specify CMAKE_PREFIX_PATH because for macos it is using some system i…
kannanjgithub Nov 25, 2025
1bd2197
Install cmake for macos.
kannanjgithub Nov 26, 2025
0f72994
Download specific cmake version as binary executable for macOS.
kannanjgithub Nov 26, 2025
1f05de3
Turn off errorProne to check if the rest of the build works for macOs
kannanjgithub Nov 26, 2025
f339cbe
Install jdk 1.8 because it uses JDK 24 and fails build due to incompa…
kannanjgithub Nov 26, 2025
8bae81b
Revert back to errorProne=true now that the JDK to use has been downg…
kannanjgithub Nov 26, 2025
5999423
Install maven for macOS
kannanjgithub Nov 26, 2025
e866102
Set ARCH to aarch_64 for macOs.
kannanjgithub Nov 26, 2025
c9469d6
Swap aarch and x86 copying for macOS in upload_artifacts.sh
kannanjgithub Nov 26, 2025
815c2ec
Try setting JAVA_HOME to make maven use the correct x86 jdk
kannanjgithub Nov 27, 2025
474e39a
Add debug flag to build gradle
kannanjgithub Nov 28, 2025
fa6760d
Remove debug flag as it is not helping, just adding noise
kannanjgithub Dec 2, 2025
ac61486
Remove ARCH to make it x86_64 throughout.
kannanjgithub Dec 2, 2025
7e78b9d
Remove setting JAVA_HOME, made no difference.
kannanjgithub Dec 2, 2025
19a3f83
Revert "Remove setting JAVA_HOME, made no difference."
kannanjgithub Dec 2, 2025
18c5bfd
Undo swapping the architectures order in upload_artifacts since we ar…
kannanjgithub Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove deleting abseil-cpp under protobuf as it doesn't exist anymore… 
… in 33.1
  • Loading branch information
@kannanjgithub
kannanjgithub committed Nov 24, 2025
commit 537d11ac40d100e181d6cd8fad0daa316deec28b
1 change: 0 additions & 1 deletion buildscripts/make_dependencies.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ del protobuf.zip
powershell -command "$ProgressPreference = 'SilentlyContinue'; $ErrorActionPreference = 'stop'; & { [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; iwr https://github.com/abseil/abseil-cpp/archive/refs/tags/%ABSL_VERSION%.zip -OutFile absl.zip }" || exit /b 1
powershell -command "$ErrorActionPreference = 'stop'; & { Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory('absl.zip', '.') }" || exit /b 1
del absl.zip
rmdir protobuf-%PROTOBUF_VER%\third_party\abseil-cpp
Comment thread
ejona86 marked this conversation as resolved.
move abseil-cpp-%ABSL_VERSION% protobuf-%PROTOBUF_VER%\third_party\abseil-cpp
mkdir protobuf-%PROTOBUF_VER%\build
pushd protobuf-%PROTOBUF_VER%\build
Expand Down
1 change: 0 additions & 1 deletion buildscripts/make_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ else
if [[ ! -d "protobuf-${PROTOBUF_VERSION}" ]]; then
curl -Ls "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-${PROTOBUF_VERSION}.tar.gz" | tar xz
curl -Ls "https://github.com/abseil/abseil-cpp/archive/refs/tags/${ABSL_VERSION}.tar.gz" | tar xz
rmdir "protobuf-$PROTOBUF_VERSION/third_party/abseil-cpp"
mv "abseil-cpp-$ABSL_VERSION" "protobuf-$PROTOBUF_VERSION/third_party/abseil-cpp"
fi
# the same source dir is used for 32 and 64 bit builds, so we need to clean stale data first
Expand Down
Loading