diff --git a/ci/Dockerfile b/ci/Dockerfile index 6c6d2aa1e..742cda3be 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -1,6 +1,5 @@ FROM ubuntu:22.04 AS build-env -ARG LIB_ROCKS_SYS_VER RUN apt-get update -y --force-yes && \ DEBIAN_FRONTEND=noninteractive \ @@ -41,18 +40,8 @@ RUN echo "=== Install rusty stuff 🦀️ ===" && \ mv ".local/bin/protoc" /bin/ && \ mv ".local/include/google" /usr/include/ && \ rm -rf .local/ protoc-21.10-linux-x86_64.zip && \ - protoc --version && \ - echo "=== Prebuilt rocksdb ===" && \ - curl -L --proto '=https' --tlsv1.2 -sSf https://crates.io/api/v1/crates/librocksdb-sys/$LIB_ROCKS_SYS_VER/download | tar -zxf - && \ - cd librocksdb-sys-$LIB_ROCKS_SYS_VER/rocksdb/ && \ - make install && \ - cd /xline && \ - rm -rf librocksdb-sys-$LIB_ROCKS_SYS_VER/ + protoc --version -# Set some environments that librocksdb-sys will use them to skip building rocksdb -ENV ROCKSDB_STATIC=1 -ENV ROCKSDB_INCLUDE_DIR=/usr/local/include -ENV ROCKSDB_LIB_DIR=/usr/local/lib # No incremental build and debug info, which might cause slow build in CI # Refer to https://matklad.github.io/2021/09/04/fast-rust-builds.html#CI-Workflow diff --git a/ci/build-env.sh b/ci/build-env.sh index ad63181c5..96d01ff5c 100755 --- a/ci/build-env.sh +++ b/ci/build-env.sh @@ -21,7 +21,7 @@ arch echo "=== Docker build ===" set -x -docker build -t ${BUILD_TAG} --progress=plain --no-cache --build-arg LIB_ROCKS_SYS_VER=$LIB_ROCKS_SYS_VER . +docker build -t ${BUILD_TAG} --progress=plain --no-cache . set +x