Skip to content

Commit

Permalink
feat(ci/risedev): install --locked (#17841)
Browse files Browse the repository at this point in the history
Signed-off-by: xxchan <[email protected]>
  • Loading branch information
xxchan authored Jul 29, 2024
1 parent 3facd96 commit 0b71744
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ set -e
for tool in cargo-llvm-cov cargo-nextest cargo-hakari cargo-sort cargo-make cargo-udeps
do
echo "install: $(tput setaf 4)$tool$(tput sgr0)"
cargo binstall -y --no-symlinks $tool
cargo binstall -y --locked --no-symlinks $tool
echo
done
Expand Down
6 changes: 3 additions & 3 deletions ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,16 @@ ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse

# install build tools
RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
RUN cargo binstall -y --no-symlinks cargo-llvm-cov cargo-nextest cargo-hakari cargo-sort cargo-cache cargo-audit \
RUN cargo binstall -y --locked --no-symlinks cargo-llvm-cov cargo-nextest cargo-hakari cargo-sort cargo-cache cargo-audit \
[email protected] \
[email protected] \
[email protected] \
&& cargo cache -a \
&& rm -rf "/root/.cargo/registry/index" \
&& rm -rf "/root/.cargo/registry/cache" \
&& rm -rf "/root/.cargo/git/db"
&& rm -rf "/root/.cargo/git/db" \
&& cargo uninstall cargo-cache
RUN cargo install [email protected] [email protected]
RUN cargo uninstall cargo-cache

# install risedev
COPY <<EOF /root/.cargo/bin/risedev
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=v20240628
export BUILD_ENV_VERSION=v20240729

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

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

source-test-env:
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240628
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240729
depends_on:
- mysql
- db
Expand All @@ -84,7 +84,7 @@ services:
- ..:/risingwave

sink-test-env:
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240628
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240729
depends_on:
- mysql
- db
Expand All @@ -107,12 +107,12 @@ services:


rw-build-env:
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240628
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240729
volumes:
- ..:/risingwave

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

regress-test-env:
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240628
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240729
depends_on:
db:
condition: service_healthy
Expand Down
1 change: 1 addition & 0 deletions src/risedevtool/common.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[env]
CARGO_MAKE_CRATE_INSTALLATION_LOCKED = true
RISEDEV = "1"
RUST_BACKTRACE = "1"
OS = { source = "${CARGO_MAKE_RUST_TARGET_OS}", mapping = { linux = "linux", macos = "darwin" } }
Expand Down

0 comments on commit 0b71744

Please sign in to comment.