Skip to content

Commit

Permalink
remove build fips
Browse files Browse the repository at this point in the history
  • Loading branch information
yuhao-su committed Jan 24, 2025
1 parent fe9026d commit 4f7f874
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
1 change: 0 additions & 1 deletion ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ RUN apt-get update -yy && \
openssl libssl-dev libsasl2-dev libcurl4-openssl-dev pkg-config bash openjdk-17-jdk wget unzip git tmux lld postgresql-client kcat netcat-openbsd mysql-client \
maven zstd libzstd-dev locales \
python3.12 python3.12-dev \
golang perl \
&& rm -rf /var/lib/{apt,dpkg,cache,log}/
ENV PYO3_PYTHON=python3.12

Expand Down
2 changes: 1 addition & 1 deletion ci/build-ci-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cat ../rust-toolchain
# shellcheck disable=SC2155

# REMEMBER TO ALSO UPDATE ci/docker-compose.yml
export BUILD_ENV_VERSION=v20250123
export BUILD_ENV_VERSION=v20250115

export BUILD_TAG="public.ecr.aws/w1p7b4n3/rw-build-env:${BUILD_ENV_VERSION}"

Expand Down
14 changes: 7 additions & 7 deletions ci/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ services:
retries: 5

source-test-env:
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20250123
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20250115
depends_on:
- mysql
- mysql-meta
Expand All @@ -106,7 +106,7 @@ services:
- ..:/risingwave

sink-test-env:
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20250123
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20250115
depends_on:
- mysql
- mysql-meta
Expand All @@ -129,28 +129,28 @@ services:
- ..:/risingwave

rw-build-env:
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20250123
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20250115
volumes:
- ..:/risingwave

# Standard environment for CI, including MySQL and Postgres for metadata.
ci-standard-env:
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20250123
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20250115
depends_on:
- mysql-meta
- db
volumes:
- ..:/risingwave

iceberg-engine-env:
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20250123
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20250115
depends_on:
- db
volumes:
- ..:/risingwave

ci-flamegraph-env:
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20250123
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20250115
# NOTE(kwannoel): This is used in order to permit
# syscalls for `nperf` (perf_event_open),
# so it can do CPU profiling.
Expand All @@ -161,7 +161,7 @@ services:
- ..:/risingwave

regress-test-env:
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20250123
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20250115
depends_on:
db:
condition: service_healthy
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ fi
echo "--- Build Rust components"

if [[ "$profile" == "ci-dev" ]]; then
RISINGWAVE_FEATURE_FLAGS=(--features rw-dynamic-link --features fips --no-default-features)
RISINGWAVE_FEATURE_FLAGS=(--features rw-dynamic-link --no-default-features)
else
RISINGWAVE_FEATURE_FLAGS=(--features rw-static-link)
configure_static_openssl
Expand Down

0 comments on commit 4f7f874

Please sign in to comment.