From d01bc916f1f0990b02d0788304310ef5cc6b8f00 Mon Sep 17 00:00:00 2001 From: zyy17 Date: Fri, 24 Jan 2025 11:29:11 +0800 Subject: [PATCH] ci: unify all protoc version to 29.3 (#5434) Co-authored-by: Ning Sun Co-authored-by: shuiyisong <113876041+shuiyisong@users.noreply.github.com> --- docker/dev-builder/android/Dockerfile | 11 ++++++++++- docker/dev-builder/centos/Dockerfile | 9 +++++++-- docker/dev-builder/ubuntu/Dockerfile | 10 ++++++---- docker/dev-builder/ubuntu/Dockerfile-18.10 | 2 +- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/docker/dev-builder/android/Dockerfile b/docker/dev-builder/android/Dockerfile index b11a9015dd..1fc2798da2 100644 --- a/docker/dev-builder/android/Dockerfile +++ b/docker/dev-builder/android/Dockerfile @@ -9,12 +9,21 @@ RUN cp ${NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/14.0.7/lib/ # Install dependencies. RUN apt-get update && apt-get install -y \ libssl-dev \ - protobuf-compiler \ curl \ git \ + unzip \ build-essential \ pkg-config +# Install protoc +ARG PROTOBUF_VERSION=29.3 + +RUN curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-linux-aarch_64.zip && \ + unzip protoc-${PROTOBUF_VERSION}-linux-aarch_64.zip -d protoc3; + +RUN mv protoc3/bin/* /usr/local/bin/ +RUN mv protoc3/include/* /usr/local/include/ + # Trust workdir RUN git config --global --add safe.directory /greptimedb diff --git a/docker/dev-builder/centos/Dockerfile b/docker/dev-builder/centos/Dockerfile index 25e7b90471..bcbf5d9570 100644 --- a/docker/dev-builder/centos/Dockerfile +++ b/docker/dev-builder/centos/Dockerfile @@ -15,8 +15,13 @@ RUN yum install -y epel-release \ which # Install protoc -RUN curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.8/protoc-3.15.8-linux-x86_64.zip -RUN unzip protoc-3.15.8-linux-x86_64.zip -d /usr/local/ +ARG PROTOBUF_VERSION=29.3 + +RUN curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-linux-x86_64.zip && \ + unzip protoc-${PROTOBUF_VERSION}-linux-x86_64.zip -d protoc3; + +RUN mv protoc3/bin/* /usr/local/bin/ +RUN mv protoc3/include/* /usr/local/include/ # Install Rust SHELL ["/bin/bash", "-c"] diff --git a/docker/dev-builder/ubuntu/Dockerfile b/docker/dev-builder/ubuntu/Dockerfile index 4dc89a12b1..d78046698c 100644 --- a/docker/dev-builder/ubuntu/Dockerfile +++ b/docker/dev-builder/ubuntu/Dockerfile @@ -22,13 +22,15 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ ARG TARGETPLATFORM RUN echo "target platform: $TARGETPLATFORM" +ARG PROTOBUF_VERSION=29.3 + # Install protobuf, because the one in the apt is too old (v3.12). RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ - curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v29.1/protoc-29.1-linux-aarch_64.zip && \ - unzip protoc-29.1-linux-aarch_64.zip -d protoc3; \ + curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-linux-aarch_64.zip && \ + unzip protoc-${PROTOBUF_VERSION}-linux-aarch_64.zip -d protoc3; \ elif [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ - curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v29.1/protoc-29.1-linux-x86_64.zip && \ - unzip protoc-29.1-linux-x86_64.zip -d protoc3; \ + curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-linux-x86_64.zip && \ + unzip protoc-${PROTOBUF_VERSION}-linux-x86_64.zip -d protoc3; \ fi RUN mv protoc3/bin/* /usr/local/bin/ RUN mv protoc3/include/* /usr/local/include/ diff --git a/docker/dev-builder/ubuntu/Dockerfile-18.10 b/docker/dev-builder/ubuntu/Dockerfile-18.10 index 1e3357be81..07a8cb1103 100644 --- a/docker/dev-builder/ubuntu/Dockerfile-18.10 +++ b/docker/dev-builder/ubuntu/Dockerfile-18.10 @@ -21,7 +21,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ pkg-config # Install protoc. -ENV PROTOC_VERSION=25.1 +ENV PROTOC_VERSION=29.3 RUN if [ "$(uname -m)" = "x86_64" ]; then \ PROTOC_ZIP=protoc-${PROTOC_VERSION}-linux-x86_64.zip; \ elif [ "$(uname -m)" = "aarch64" ]; then \