Merge pull request #10519 from everpcpc/fix-benchmark

chore(ci): fix download artifact for benchmark

Author: everpcpc

.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: |

.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: |

.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:

.github/workflows/release.yml

@@ -16,6 +16,7 @@ on:
 
 permissions:
   id-token: write
+  pull-requests: write
   contents: write
 
 jobs:

.github/workflows/trusted-benchmark.yml

@@ -14,14 +14,15 @@ on:
 
 permissions:
   id-token: write
+  pull-requests: write
   contents: read
 
 env:
   BENCHMARK_S3_PREFIX: s3://repo.databend.rs/benchmark/clickbench
 
 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 }}

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"