diff --git a/.github/actions/setup-duckdb/action.yml b/.github/actions/setup-duckdb/action.yml index 58964dda51d..51d920304e9 100644 --- a/.github/actions/setup-duckdb/action.yml +++ b/.github/actions/setup-duckdb/action.yml @@ -10,8 +10,17 @@ runs: - name: Download DuckDB shell: bash run: | + case "$(uname -m)" in + x86_64) duckdb_arch=amd64 ;; + aarch64|arm64) duckdb_arch=arm64 ;; + *) + echo "Unsupported architecture: $(uname -m)" >&2 + exit 1 + ;; + esac + wget -qO- \ - "https://github.com/duckdb/duckdb/releases/download/v${{ inputs.duckdb_version }}/duckdb_cli-linux-amd64.zip" \ + "https://github.com/duckdb/duckdb/releases/download/v${{ inputs.duckdb_version }}/duckdb_cli-linux-${duckdb_arch}.zip" \ | funzip > duckdb chmod +x duckdb echo "$PWD" >> "$GITHUB_PATH" diff --git a/.github/workflows/develop-bench.yml b/.github/workflows/develop-bench.yml index 203d34011d3..80106b43af8 100644 --- a/.github/workflows/develop-bench.yml +++ b/.github/workflows/develop-bench.yml @@ -35,7 +35,7 @@ jobs: timeout-minutes: 60 runs-on: >- ${{ github.repository == 'vortex-data/vortex' - && format('runs-on={0}/runner=bench-dedicated/family=c6id.8xlarge/extras=s3-cache/tag=build-{1}', github.run_id, matrix.benchmark.id) + && format('runs-on={0}/runner=bench-dedicated/family=c8gd.8xlarge/image=ubuntu24-full-arm64-pre-v2/extras=s3-cache/tag=build-{1}', github.run_id, matrix.benchmark.id) || 'ubuntu-latest' }} strategy: fail-fast: false @@ -53,7 +53,7 @@ jobs: with: sccache: s3 - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - - uses: ./.github/actions/setup-rust + - uses: ./.github/actions/setup-prebuild with: repo-token: ${{ secrets.GITHUB_TOKEN }} enable-sccache: ${{ github.repository == 'vortex-data/vortex' && 'true' || 'false' }} @@ -83,7 +83,7 @@ jobs: timeout-minutes: 120 runs-on: >- ${{ github.repository == 'vortex-data/vortex' - && format('runs-on={0}/runner=bench-dedicated/family=c6id.metal/extras=s3-cache/tag={1}', github.run_id, matrix.benchmark.id) + && format('runs-on={0}/runner=bench-dedicated/family=c8gd.metal-24xl/image=ubuntu24-full-arm64-pre-v2/extras=s3-cache/tag={1}', github.run_id, matrix.benchmark.id) || 'ubuntu-latest' }} strategy: fail-fast: false diff --git a/.github/workflows/nightly-bench.yml b/.github/workflows/nightly-bench.yml index cc90e07316f..879edc0ba45 100644 --- a/.github/workflows/nightly-bench.yml +++ b/.github/workflows/nightly-bench.yml @@ -29,5 +29,5 @@ jobs: fail-fast: false matrix: machine_type: - - id: x86 - instance_name: c6id.metal + - id: arm64 + instance_name: c8gd.metal-24xl diff --git a/.github/workflows/pr-bench-runner.yml b/.github/workflows/pr-bench-runner.yml index e1fe46ef502..bc68ee2ef73 100644 --- a/.github/workflows/pr-bench-runner.yml +++ b/.github/workflows/pr-bench-runner.yml @@ -32,7 +32,7 @@ jobs: timeout-minutes: 60 runs-on: >- ${{ github.repository == 'vortex-data/vortex' - && format('runs-on={0}/runner=bench-dedicated/family=c6id.8xlarge/tag=build-{1}{2}', github.run_id, inputs.benchmark_id, github.event.pull_request.head.repo.fork == false && '/extras=s3-cache' || '') + && format('runs-on={0}/runner=bench-dedicated/family=c8gd.8xlarge/image=ubuntu24-full-arm64-pre-v2/tag=build-{1}{2}', github.run_id, inputs.benchmark_id, github.event.pull_request.head.repo.fork == false && '/extras=s3-cache' || '') || 'ubuntu-latest' }} steps: - uses: runs-on/action@v2 @@ -43,7 +43,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha || github.sha }} fetch-depth: 0 - - uses: ./.github/actions/setup-rust + - uses: ./.github/actions/setup-prebuild with: repo-token: ${{ secrets.GITHUB_TOKEN }} enable-sccache: ${{ github.event.pull_request.head.repo.fork == false && 'true' || 'false' }} @@ -75,7 +75,7 @@ jobs: timeout-minutes: 120 runs-on: >- ${{ github.repository == 'vortex-data/vortex' - && format('runs-on={0}/runner=bench-dedicated/family=c6id.metal/tag={1}{2}', github.run_id, inputs.benchmark_id, github.event.pull_request.head.repo.fork == false && '/extras=s3-cache' || '') + && format('runs-on={0}/runner=bench-dedicated/family=c8gd.metal-24xl/image=ubuntu24-full-arm64-pre-v2/tag={1}{2}', github.run_id, inputs.benchmark_id, github.event.pull_request.head.repo.fork == false && '/extras=s3-cache' || '') || 'ubuntu-latest' }} steps: # `extras=s3-cache` points ACTIONS_RESULTS_URL at the RunsOn artifact proxy, but only diff --git a/.github/workflows/sql-bench-matrix.yml b/.github/workflows/sql-bench-matrix.yml index cae3630d6b8..ca77eb4f32a 100644 --- a/.github/workflows/sql-bench-matrix.yml +++ b/.github/workflows/sql-bench-matrix.yml @@ -13,7 +13,7 @@ on: machine_type: required: false type: string - default: c6id.metal + default: c8gd.metal-24xl jobs: resolve-matrix: @@ -50,7 +50,7 @@ jobs: FLAT_LAYOUT_INLINE_ARRAY_NODE: "1" runs-on: >- ${{ github.repository == 'vortex-data/vortex' - && format('runs-on={0}/runner=bench-dedicated/family=c6id.8xlarge/tag=build{1}', github.run_id, (inputs.mode != 'pr' || github.event.pull_request.head.repo.fork == false) && '/extras=s3-cache' || '') + && format('runs-on={0}/runner=bench-dedicated/family=c8gd.8xlarge/image=ubuntu24-full-arm64-pre-v2/tag=build{1}', github.run_id, (inputs.mode != 'pr' || github.event.pull_request.head.repo.fork == false) && '/extras=s3-cache' || '') || 'ubuntu-latest' }} steps: - uses: runs-on/action@v2 @@ -60,7 +60,7 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: ref: ${{ inputs.mode == 'pr' && github.event.pull_request.head.sha || github.sha }} - - uses: ./.github/actions/setup-rust + - uses: ./.github/actions/setup-prebuild with: repo-token: ${{ secrets.GITHUB_TOKEN }} enable-sccache: ${{ (inputs.mode != 'pr' || github.event.pull_request.head.repo.fork == false) && 'true' || 'false' }} @@ -112,7 +112,7 @@ jobs: runs-on: >- ${{ github.repository == 'vortex-data/vortex' - && format('runs-on={0}/runner=bench-dedicated/family={1}/tag={2}{3}', github.run_id, inputs.machine_type, matrix.id, (inputs.mode != 'pr' || github.event.pull_request.head.repo.fork == false) && '/extras=s3-cache' || '') + && format('runs-on={0}/runner=bench-dedicated/family={1}/image=ubuntu24-full-arm64-pre-v2/tag={2}{3}', github.run_id, inputs.machine_type, matrix.id, (inputs.mode != 'pr' || github.event.pull_request.head.repo.fork == false) && '/extras=s3-cache' || '') || 'ubuntu-latest' }} steps: - uses: runs-on/action@v2 @@ -123,7 +123,7 @@ jobs: with: ref: ${{ inputs.mode == 'pr' && github.event.pull_request.head.sha || github.sha }} fetch-depth: ${{ inputs.mode == 'pr' && '0' || '1' }} - - uses: ./.github/actions/setup-rust + - uses: ./.github/actions/setup-prebuild with: repo-token: ${{ secrets.GITHUB_TOKEN }} enable-sccache: ${{ (inputs.mode != 'pr' || github.event.pull_request.head.repo.fork == false) && 'true' || 'false' }}