diff --git a/.github/workflows/reuse.linux.yml b/.github/workflows/reuse.linux.yml index 361aca6039f1..2b0f6930e7ba 100644 --- a/.github/workflows/reuse.linux.yml +++ b/.github/workflows/reuse.linux.yml @@ -300,7 +300,7 @@ jobs: QUERY_DATABEND_ENTERPRISE_LICENSE: ${{ steps.license.outputs.license }} with: dirs: ee - handlers: mysql,http,clickhouse + handlers: mysql,http storage-format: ${{ matrix.format }} - name: Upload failure if: failure() diff --git a/.github/workflows/reuse.sqllogic.yml b/.github/workflows/reuse.sqllogic.yml index 1dc6f1fe41f3..aca6b66aaa9f 100644 --- a/.github/workflows/reuse.sqllogic.yml +++ b/.github/workflows/reuse.sqllogic.yml @@ -27,7 +27,7 @@ jobs: timeout-minutes: 10 with: dirs: management - handlers: mysql,http,clickhouse + handlers: mysql,http standalone: runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"] @@ -46,7 +46,6 @@ jobs: handler: - "mysql" - "http" - - "clickhouse" steps: - uses: actions/checkout@v4 - uses: ./.github/actions/test_sqllogic_standalone_linux @@ -74,7 +73,7 @@ jobs: timeout-minutes: 15 with: dirs: udf_server - handlers: mysql,http,clickhouse + handlers: mysql,http storage-format: all - name: Upload failure if: failure() || cancelled() @@ -95,7 +94,7 @@ jobs: timeout-minutes: 15 with: dirs: task - handlers: mysql,http,clickhouse + handlers: mysql,http storage-format: all - name: Upload failure if: failure() || cancelled() @@ -120,7 +119,6 @@ jobs: handler: - "mysql" - "http" - - "clickhouse" steps: - uses: actions/checkout@v4 - uses: ./.github/actions/test_sqllogic_cluster_linux @@ -149,7 +147,7 @@ jobs: with: storage: ${{ matrix.storage }} dirs: stage - handlers: mysql,http,clickhouse + handlers: mysql,http - name: Upload failure if: failure() uses: ./.github/actions/artifact_failure diff --git a/scripts/ci/ci-run-ee-sqllogic-tests.sh b/scripts/ci/ci-run-ee-sqllogic-tests.sh index 6360428c7e22..5588123387d8 100644 --- a/scripts/ci/ci-run-ee-sqllogic-tests.sh +++ b/scripts/ci/ci-run-ee-sqllogic-tests.sh @@ -9,7 +9,7 @@ export STORAGE_ALLOW_INSECURE=true echo "Starting standalone DatabendQuery and DatabendMeta" ./scripts/ci/deploy/databend-query-standalone.sh -TEST_HANDLERS=${TEST_HANDLERS:-"mysql,http,clickhouse"} +TEST_HANDLERS=${TEST_HANDLERS:-"mysql,http"} BUILD_PROFILE=${BUILD_PROFILE:-debug} RUN_DIR="" diff --git a/scripts/ci/ci-run-sqllogic-tests-cloud.sh b/scripts/ci/ci-run-sqllogic-tests-cloud.sh index 16b69873885f..83e7b6696af3 100755 --- a/scripts/ci/ci-run-sqllogic-tests-cloud.sh +++ b/scripts/ci/ci-run-sqllogic-tests-cloud.sh @@ -9,7 +9,7 @@ export STORAGE_ALLOW_INSECURE=true echo "Starting standalone DatabendQuery and DatabendMeta" ./scripts/ci/deploy/databend-query-standalone.sh -TEST_HANDLERS=${TEST_HANDLERS:-"mysql,http,clickhouse"} +TEST_HANDLERS=${TEST_HANDLERS:-"mysql,http"} BUILD_PROFILE=${BUILD_PROFILE:-debug} RUN_DIR="" diff --git a/scripts/ci/ci-run-sqllogic-tests-cluster.sh b/scripts/ci/ci-run-sqllogic-tests-cluster.sh index b70dca1e0873..0965e470a3cc 100755 --- a/scripts/ci/ci-run-sqllogic-tests-cluster.sh +++ b/scripts/ci/ci-run-sqllogic-tests-cluster.sh @@ -11,7 +11,7 @@ echo "Starting Cluster databend-query" export RUST_BACKTRACE=1 -TEST_HANDLERS=${TEST_HANDLERS:-"mysql,http,clickhouse"} +TEST_HANDLERS=${TEST_HANDLERS:-"mysql,http"} BUILD_PROFILE=${BUILD_PROFILE:-debug} RUN_DIR="" diff --git a/scripts/ci/ci-run-sqllogic-tests-management-mode.sh b/scripts/ci/ci-run-sqllogic-tests-management-mode.sh index ad9adc2b0273..c147dcc948a9 100644 --- a/scripts/ci/ci-run-sqllogic-tests-management-mode.sh +++ b/scripts/ci/ci-run-sqllogic-tests-management-mode.sh @@ -9,7 +9,7 @@ export STORAGE_ALLOW_INSECURE=true echo "Starting standalone DatabendQuery and DatabendMeta" ./scripts/ci/deploy/databend-query-management-mode.sh -TEST_HANDLERS=${TEST_HANDLERS:-"mysql,http,clickhouse"} +TEST_HANDLERS=${TEST_HANDLERS:-"mysql,http"} BUILD_PROFILE=${BUILD_PROFILE:-debug} RUN_DIR="" diff --git a/scripts/ci/ci-run-sqllogic-tests-native.sh b/scripts/ci/ci-run-sqllogic-tests-native.sh index 0bb02f0175db..3710801b95be 100755 --- a/scripts/ci/ci-run-sqllogic-tests-native.sh +++ b/scripts/ci/ci-run-sqllogic-tests-native.sh @@ -9,7 +9,7 @@ export STORAGE_ALLOW_INSECURE=true echo "Starting standalone DatabendQuery and DatabendMeta" ./scripts/ci/deploy/databend-query-standalone-native.sh -TEST_HANDLERS=${TEST_HANDLERS:-"mysql,http,clickhouse"} +TEST_HANDLERS=${TEST_HANDLERS:-"mysql,http"} BUILD_PROFILE=${BUILD_PROFILE:-debug} RUN_DIR="" diff --git a/scripts/ci/ci-run-sqllogic-tests-without-sandbox.sh b/scripts/ci/ci-run-sqllogic-tests-without-sandbox.sh index 8d93a446f388..6738b0802988 100755 --- a/scripts/ci/ci-run-sqllogic-tests-without-sandbox.sh +++ b/scripts/ci/ci-run-sqllogic-tests-without-sandbox.sh @@ -9,7 +9,7 @@ export STORAGE_ALLOW_INSECURE=true echo "Starting standalone DatabendQuery and DatabendMeta" ./scripts/ci/deploy/databend-query-standalone.sh -TEST_HANDLERS=${TEST_HANDLERS:-"mysql,http,clickhouse"} +TEST_HANDLERS=${TEST_HANDLERS:-"mysql,http"} BUILD_PROFILE=${BUILD_PROFILE:-debug} RUN_DIR="" diff --git a/scripts/ci/ci-run-sqllogic-tests.sh b/scripts/ci/ci-run-sqllogic-tests.sh index 16b69873885f..83e7b6696af3 100755 --- a/scripts/ci/ci-run-sqllogic-tests.sh +++ b/scripts/ci/ci-run-sqllogic-tests.sh @@ -9,7 +9,7 @@ export STORAGE_ALLOW_INSECURE=true echo "Starting standalone DatabendQuery and DatabendMeta" ./scripts/ci/deploy/databend-query-standalone.sh -TEST_HANDLERS=${TEST_HANDLERS:-"mysql,http,clickhouse"} +TEST_HANDLERS=${TEST_HANDLERS:-"mysql,http"} BUILD_PROFILE=${BUILD_PROFILE:-debug} RUN_DIR="" diff --git a/scripts/setup/dev_setup.sh b/scripts/setup/dev_setup.sh index bcf83c00a1e6..205659922674 100755 --- a/scripts/setup/dev_setup.sh +++ b/scripts/setup/dev_setup.sh @@ -162,45 +162,6 @@ function install_openssl { esac } -function install_sccache { - PACKAGE_MANAGER=$1 - - if sccache --version; then - echo "==> sccache is already installed" - return - fi - echo "==> installing sccache..." - - case "$PACKAGE_MANAGER" in - brew) - install_pkg sccache "$PACKAGE_MANAGER" - ;; - *) - - arch=$(uname -m) - case "$arch" in - amd64) - arch="x86_64" - ;; - arm64) - arch="aarch64" - ;; - esac - download_version="v0.5.3" - download_target="sccache-${download_version}-${arch}-unknown-linux-musl" - SCCACHE_RELEASE="https://github.com/mozilla/sccache/releases/" - curl -fLo sccache.tar.gz "${SCCACHE_RELEASE}/download/${download_version}/${download_target}.tar.gz" - tar -xzf sccache.tar.gz - "${PRE_COMMAND[@]}" cp "${download_target}/sccache" /usr/local/bin/ - "${PRE_COMMAND[@]}" chmod +x /usr/local/bin/sccache - rm -rf "${download_target}" - rm sccache.tar.gz - ;; - esac - - sccache --version -} - function install_protobuf { PACKAGE_MANAGER=$1 @@ -568,16 +529,15 @@ if [[ "$INSTALL_BUILD_TOOLS" == "true" ]]; then # Any call to cargo will make rustup install the correct toolchain cargo version - - # Install tools that needed in build - install_sccache "$PACKAGE_MANAGER" + cargo install cargo-quickinstall + cargo quickinstall cargo-binstall + cargo binstall -y sccache + cargo binstall -y cargo-zigbuild fi if [[ "$INSTALL_CHECK_TOOLS" == "true" ]]; then if [[ -f scripts/setup/rust-tools.txt ]]; then export RUSTFLAGS="-C target-feature=-crt-static" - cargo install cargo-quickinstall - cargo quickinstall cargo-binstall while read -r tool; do cargo binstall -y "$tool" done