diff --git a/.github/actions/benchmark_cloud/action.yml b/.github/actions/benchmark_cloud/action.yml index fe3e3740de7e9..12049786f9588 100644 --- a/.github/actions/benchmark_cloud/action.yml +++ b/.github/actions/benchmark_cloud/action.yml @@ -38,8 +38,6 @@ inputs: runs: using: "composite" steps: - - uses: ./.github/actions/setup_bendsql - - name: Install script dependencies shell: bash run: | diff --git a/.github/actions/benchmark_local/action.yml b/.github/actions/benchmark_local/action.yml index 70f5793d0a68a..ef7d5ee713852 100644 --- a/.github/actions/benchmark_local/action.yml +++ b/.github/actions/benchmark_local/action.yml @@ -19,8 +19,6 @@ inputs: runs: using: "composite" steps: - - uses: ./.github/actions/setup_bendsql - - name: Install script dependencies shell: bash run: | diff --git a/.github/actions/setup_bendsql/action.yml b/.github/actions/setup_bendsql/action.yml index 262da646a363f..6357f8085c734 100644 --- a/.github/actions/setup_bendsql/action.yml +++ b/.github/actions/setup_bendsql/action.yml @@ -4,7 +4,7 @@ inputs: version: description: "bendsql version" required: false - default: v0.3.5 + default: v0.3.7 runs: using: "composite" steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2f003fca87679..c7d7694e578fc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,7 @@ on: permissions: id-token: write + pull-requests: write contents: write jobs: diff --git a/.github/workflows/trusted-benchmark.yml b/.github/workflows/trusted-benchmark.yml index bca71cb28d8de..ee771f0b1a751 100644 --- a/.github/workflows/trusted-benchmark.yml +++ b/.github/workflows/trusted-benchmark.yml @@ -14,6 +14,7 @@ on: permissions: id-token: write + pull-requests: write contents: read env: @@ -21,7 +22,7 @@ env: jobs: metadata: - if: github.event.workflow_run.conclusion == 'success' + if: github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_call' runs-on: [self-hosted, X64, Linux, dev] outputs: sha: ${{ steps.metadata.outputs.sha }} @@ -67,6 +68,7 @@ jobs: - tpch steps: - uses: actions/checkout@v3 + - uses: ./.github/actions/setup_bendsql - name: Download artifact run: | mkdir -p ./target/release @@ -78,7 +80,7 @@ jobs: release) version=${{ needs.metadata.outputs.source_id }} target=x86_64-unknown-linux-gnu - wget -P distro -qc https://repo.databend.rs/databend/${version}/databend-${version}-${target}.tar.gz + aws s3 cp s3://repo.databend.rs/databend/${version}/databend-${version}-${target}.tar.gz distro/ tar x -C ./target/release -f ./distro/databend-${version}-${target}.tar.gz --strip-components 1 bin/ ;; *) @@ -159,6 +161,7 @@ jobs: runs-on: [self-hosted, X64, Linux, dev] steps: - uses: actions/checkout@v3 + - uses: ./.github/actions/setup_bendsql - uses: ./.github/actions/benchmark_cloud with: sha: ${{ needs.metadata.outputs.sha }} diff --git a/benchmark/clickbench/benchmark_cloud.sh b/benchmark/clickbench/benchmark_cloud.sh index ee09073a5fcf8..2e740ca134213 100755 --- a/benchmark/clickbench/benchmark_cloud.sh +++ b/benchmark/clickbench/benchmark_cloud.sh @@ -43,7 +43,7 @@ bendsql cloud warehouse create "${CLOUD_WAREHOUSE}" --size "${BENCHMARK_SIZE}" - bendsql cloud warehouse ls bendsql cloud warehouse resume "${CLOUD_WAREHOUSE}" --wait -bendsql cloud use "${CLOUD_WAREHOUSE}" +bendsql cloud warehouse use "${CLOUD_WAREHOUSE}" # Data loaded before the benchmark starts # bendsql query <"${BENCHMARK_DATASET}/create.sql"