Skip to content

Commit

Permalink
ci: add machete dep
Browse files Browse the repository at this point in the history
Signed-off-by: iGxnon <[email protected]>
  • Loading branch information
iGxnon authored and mergify[bot] committed Jan 31, 2024
1 parent 48c1989 commit 43094eb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ jobs:
- name: Sort crates
run: cargo sort --check --workspace

# TODO: trigger `Build Env` to release `ghcr.io/xline-kv/build-env:latest` when this PR is merged, then uncomment the step
# - name: Check dependencies
# run: cargo machete --fix crates/

- name: Workspace hack check
run: cargo hakari generate --diff && cargo hakari manage-deps --dry-run && cargo hakari verify

Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN echo "=== Install rusty stuff 🦀️ ===" && \
rustup component add rustfmt llvm-tools clippy && \
rustup show -v && \
curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash && \
cargo binstall -y --no-symlinks cargo-llvm-cov cargo-nextest cargo-hakari cargo-sort cargo-cache cargo-audit && \
cargo binstall -y --no-symlinks cargo-llvm-cov cargo-nextest cargo-hakari cargo-sort cargo-cache cargo-audit cargo-machete && \
cargo install --locked sccache && \
cargo cache --autoclean && \
rm -rf "/root/.cargo/registry/index" && \
Expand Down
10 changes: 0 additions & 10 deletions ci/build-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,6 @@ cat rust-toolchain.toml
export DOCKER_BUILDKIT=1
export GHCR_ORG=xline-kv
export BUILD_TAG="ghcr.io/${GHCR_ORG}/build-env:latest"
set +e
workflows=("pull_request.yml" "merge_queue.yml" "benchmark.yml")
for workflow in "${workflows[@]}"
do
if ! grep "${BUILD_TAG}" "../.github/workflows/${workflow}" > /dev/null; then
echo "container: ${BUILD_TAG} is not set up for ${workflow}, please update ${workflow}"
exit 1
fi
done
set -e

# Change this version if rust-rocksdb updates in `engine`
export LIB_ROCKS_SYS_VER="0.11.0+8.1.1"
Expand Down

0 comments on commit 43094eb

Please sign in to comment.