Skip to content

Commit

Permalink
ci: refine trap; remove misc check (#20030)
Browse files Browse the repository at this point in the history
Signed-off-by: xxchan <[email protected]>
  • Loading branch information
xxchan authored Jan 7, 2025
1 parent b098e15 commit 5084d92
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 28 deletions.
6 changes: 6 additions & 0 deletions ci/scripts/check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ configure_static_openssl
echo "--- Run trailing spaces check"
scripts/check/check-trailing-spaces.sh

echo "--- Check protobuf code format && Lint protobuf"
cd proto
buf format -d --exit-code
buf lint
cd ..

echo "--- Rust cargo-sort check"
cargo sort --check --workspace --grouped

Expand Down
5 changes: 5 additions & 0 deletions ci/scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ export RW_SECRET_STORE_PRIVATE_KEY_HEX="0123456789abcdef0123456789abcdef"
unset LANG

function dump_diagnose_info() {
ret=$?
if [ $ret -eq 0 ]; then
exit 0
fi

echo "^^^ +++"
echo "--- Failed to run command! Dumping diagnose info..."
if [ -f .risingwave/config/risedev-env ]; then
Expand Down
11 changes: 0 additions & 11 deletions ci/scripts/misc-check.sh

This file was deleted.

15 changes: 0 additions & 15 deletions ci/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -656,21 +656,6 @@ steps:
cancel_on_build_failing: true
retry: *auto-retry

- label: "misc check"
command: "ci/scripts/misc-check.sh"
if: |
!(build.pull_request.labels includes "ci/pr/run-selected") && build.env("CI_STEPS") == null
|| build.pull_request.labels includes "ci/run-misc-check"
|| build.env("CI_STEPS") =~ /(^|,)misc-check(,|$$)/
plugins:
- docker-compose#v5.5.0:
run: rw-build-env
config: ci/docker-compose.yml
- shellcheck#v1.2.0:
files: ./**/*.sh
timeout_in_minutes: 5
retry: *auto-retry

# The following jobs are triggered only when PR has corresponding labels.

# Generates cpu flamegraph env
Expand Down
2 changes: 0 additions & 2 deletions docs/dev/src/tests/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ RisingWave requires all code to pass fmt, clippy, sort and hakari checks. Run th
./risedev c # Run all checks. Shortcut for ./risedev check
```

There are also some miscellaneous checks. See `ci/scripts/misc-check.sh`.

## Unit and integration tests

RiseDev runs unit tests with cargo-nextest. To run unit tests:
Expand Down

0 comments on commit 5084d92

Please sign in to comment.