Skip to content

Commit 69d4746

Browse files
authored
ci: move tpc-h & clickbench benchs to runs-on (#2600)
1 parent 283120c commit 69d4746

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

.github/workflows/bench-pr.yml

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
- family=c7i.8xlarge
3030
- image=ubuntu24-full-x64
3131
- disk=large
32+
- tag=${{ matrix.id }}
3233
strategy:
3334
matrix:
3435
benchmark:

.github/workflows/bench.yml

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
- family=c7i.8xlarge
3636
- image=ubuntu24-full-x64
3737
- disk=large
38+
- tag=${{ matrix.id }}
3839
strategy:
3940
matrix:
4041
benchmark:

.github/workflows/sql-benchmarks.yml

+12-11
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,24 @@ jobs:
1818
- id: tpch-nvme
1919
binary_name: tpch
2020
name: TPC-H on NVME
21-
cloud_provider: gcp
2221
- id: clickbench-nvme
2322
binary_name: clickbench
2423
name: Clickbench on NVME
25-
cloud_provider: gcp
2624
- id: tpch-s3
2725
binary_name: tpch
2826
name: TPC-H on S3
29-
cloud_provider: aws
3027
remote_storage: s3://vortex-bench-dev/tpch-sf1/
3128
runs-on:
32-
- self-hosted
33-
- ${{ matrix.cloud_provider }}
29+
- runs-on=${{ github.run_id }}
30+
- family=c7i.8xlarge
31+
- image=ubuntu24-full-x64
32+
- disk=large
33+
- tag=${{ matrix.id }}
34+
3435
steps:
36+
- uses: runs-on/action@v1
3537
- uses: actions/checkout@v4
36-
- uses: ./.github/actions/cleanup
37-
- uses: ./.github/actions/setup-rust
38-
- name: Set tempdir
39-
if: runner.environment == 'self-hosted'
40-
run: |
41-
echo "TMPDIR=/work" >> $GITHUB_ENV
38+
# rustup is pre-installed on the ubuntu24-full-x64 image.
4239

4340
- name: Run ${{ matrix.name }} benchmark
4441
if: matrix.remote_storage == null
@@ -85,10 +82,12 @@ jobs:
8582
with:
8683
role-to-assume: arn:aws:iam::375504701696:role/GitHubBenchmarkRole
8784
aws-region: us-east-1
85+
8886
- name: Install uv
8987
if: inputs.mode == 'pr'
9088
uses: astral-sh/setup-uv@v5
9189
- name: Compare results
90+
9291
if: inputs.mode == 'pr'
9392
shell: bash
9493
run: |
@@ -107,6 +106,7 @@ jobs:
107106
uv run --no-project scripts/compare-benchmark-jsons.py base.json results.json \
108107
>> comment.md
109108
echo '</details>' >> comment.md
109+
110110
- name: Comment PR
111111
if: inputs.mode == 'pr'
112112
uses: thollander/actions-comment-pull-request@v3
@@ -116,6 +116,7 @@ jobs:
116116
# this action will *update* the comment instead of posting a new comment. Therefore, each
117117
# unique benchmark configuration must have a unique comment-tag.
118118
comment-tag: bench-pr-comment-${{ matrix.id }}
119+
119120
- name: Upload Benchmark Results
120121
if: inputs.mode == 'develop'
121122
shell: bash

0 commit comments

Comments
 (0)