From 9b498dd117da61f7cebf3b412e1cedb012bfda44 Mon Sep 17 00:00:00 2001 From: Huangjw <1223644280@qq.com> Date: Thu, 14 Sep 2023 19:11:04 +0800 Subject: [PATCH] chore(ci): install locales in prebuilt image (#12311) Signed-off-by: Bugen Zhao Co-authored-by: Bugen Zhao --- ci/Dockerfile | 4 ++-- ci/build-ci-image.sh | 2 +- ci/docker-compose.yml | 10 +++++----- ci/scripts/regress-test.sh | 2 -- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index ec7607f0d62ba..4b0663bc7f529 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -7,7 +7,7 @@ RUN sed -i 's|http://archive.ubuntu.com/ubuntu|http://us-east-2.ec2.archive.ubun RUN apt-get update -yy && \ DEBIAN_FRONTEND=noninteractive apt-get -y install make build-essential cmake protobuf-compiler curl parallel python3 python3-pip \ openssl libssl-dev libsasl2-dev libcurl4-openssl-dev pkg-config bash openjdk-11-jdk wget unzip git tmux lld postgresql-client kafkacat netcat mysql-client \ - maven zstd libzstd-dev -yy \ + maven zstd libzstd-dev locales -yy \ && rm -rf /var/lib/{apt,dpkg,cache,log}/ SHELL ["/bin/bash", "-c"] @@ -43,7 +43,7 @@ RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/ca RUN cargo binstall -y --no-symlinks cargo-llvm-cov cargo-nextest cargo-hakari cargo-sort cargo-cache cargo-audit \ cargo-make@0.36.10 \ sqllogictest-bin@0.15.3 \ - && cargo install sccache --locked \ + && cargo install sccache \ && cargo cache -a \ && rm -rf "/root/.cargo/registry/index" \ && rm -rf "/root/.cargo/registry/cache" \ diff --git a/ci/build-ci-image.sh b/ci/build-ci-image.sh index 299b5d91878fe..078fd419bd541 100755 --- a/ci/build-ci-image.sh +++ b/ci/build-ci-image.sh @@ -13,7 +13,7 @@ cat ../rust-toolchain # !!! CHANGE THIS WHEN YOU WANT TO BUMP CI IMAGE !!! # # AND ALSO docker-compose.yml # ###################################################### -export BUILD_ENV_VERSION=v20230909 +export BUILD_ENV_VERSION=v20230914 export BUILD_TAG="public.ecr.aws/x5u3w5h6/rw-build-env:${BUILD_ENV_VERSION}" diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml index d0cdbe4af816a..4f5da42df5405 100644 --- a/ci/docker-compose.yml +++ b/ci/docker-compose.yml @@ -71,7 +71,7 @@ services: retries: 5 source-test-env: - image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230909 + image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230914 depends_on: - mysql - db @@ -81,7 +81,7 @@ services: - ..:/risingwave sink-test-env: - image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230909 + image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230914 depends_on: - mysql - db @@ -91,12 +91,12 @@ services: - ..:/risingwave rw-build-env: - image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230909 + image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230914 volumes: - ..:/risingwave ci-flamegraph-env: - image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230909 + image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230914 # NOTE(kwannoel): This is used in order to permit # syscalls for `nperf` (perf_event_open), # so it can do CPU profiling. @@ -107,7 +107,7 @@ services: - ..:/risingwave regress-test-env: - image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230909 + image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230914 depends_on: db: condition: service_healthy diff --git a/ci/scripts/regress-test.sh b/ci/scripts/regress-test.sh index aa1ba7836dc57..aa5912e591df8 100755 --- a/ci/scripts/regress-test.sh +++ b/ci/scripts/regress-test.sh @@ -30,8 +30,6 @@ mv target/debug/risingwave_regress_test-"$profile" target/debug/risingwave_regre chmod +x ./target/debug/risingwave_regress_test echo "--- Postgres regress test" -apt-get -y update -apt-get -y install locales locale-gen C export LANGUAGE=C export LANG=C