Skip to content

Commit a06d81e

Browse files
committed
fix ci
1 parent bc7febb commit a06d81e

File tree

3 files changed

+12
-24
lines changed

3 files changed

+12
-24
lines changed

Diff for: .github/actions/test_sqllogic_cluster_linux/action.yml

+3-11
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,12 @@ runs:
2626
profile: ${{ inputs.profile }}
2727
sha: ${{ github.sha }}
2828
target: ${{ inputs.target }}
29-
3029
- name: Setup Build Tool
3130
uses: ./.github/actions/setup_build_tool
3231
with:
3332
bypass_env_vars: RUSTFLAGS,RUSTDOCFLAGS,RUST_TEST_THREADS,RUST_LOG,RUST_BACKTRACE
34-
- shell: bash
35-
run: ./scripts/ci/deploy/databend-query-cluster-3-nodes.sh
36-
- name: Run sqllogic tests with cluster mode
33+
- name: Run sqllogic Tests with Cluster mode
3734
shell: bash
38-
run: |
39-
cargo run -p sqllogictests -- --run_dir base
40-
cargo run -p sqllogictests -- --run_dir query
41-
cargo run -p sqllogictests -- --run_dir cluster
4235
env:
43-
RUST_TEST_THREADS: "2"
44-
RUST_LOG: DEBUG
45-
RUST_BACKTRACE: full
36+
TEST_HANDLERS: ${{ inputs.handlers }}
37+
run: bash ./scripts/ci/ci-run-sqllogic-tests-cluster.sh ${{ inputs.dirs }}

Diff for: .github/actions/test_sqllogic_standalone_macos/action.yml

+8-12
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,13 @@ runs:
2626
profile: ${{ inputs.profile }}
2727
sha: ${{ github.sha }}
2828
target: ${{ inputs.target }}
29-
30-
- name: Setup Build Tool
31-
uses: ./.github/actions/setup_build_tool
32-
with:
33-
bypass_env_vars: RUSTFLAGS,RUSTDOCFLAGS,RUST_TEST_THREADS,RUST_LOG,RUST_BACKTRACE
34-
- shell: bash
35-
run: ./scripts/ci/deploy/databend-query-standalone.sh
36-
- name: Run sqllogic tests with standalone mode (macos)
29+
- name: Test setup
30+
shell: bash
31+
run: |
32+
bash ./scripts/setup/dev_setup.sh -yd
33+
- name: Run sqllogic Tests with Standalone mode with embedded meta-store
3734
shell: bash
38-
run: cargo run -p sqllogictests -- --skip_dir cluster
3935
env:
40-
RUST_TEST_THREADS: "2"
41-
RUST_LOG: DEBUG
42-
RUST_BACKTRACE: full
36+
TEST_HANDLERS: ${{ inputs.handlers }}
37+
run: |
38+
bash ./scripts/ci/ci-run-sqllogic-tests.sh ${{ inputs.dirs }}

Diff for: scripts/ci/ci-run-sqllogic-tests-cluster.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ TEST_HANDLERS=${TEST_HANDLERS:-"mysql,http,clickhouse"}
1111

1212
RUN_DIR=""
1313
if [ $# -gt 0 ]; then
14-
RUN_DIR="--run-dir $*"
14+
RUN_DIR="--run_dir $*"
1515
fi
1616
echo "Run suites using argument: $RUN_DIR"
1717

0 commit comments

Comments
 (0)