Skip to content

Commit d5f374c

Browse files
authored
Merge branch 'trunk' into peasee/260217-spice-management-login
2 parents 65aec37 + 28a9c5b commit d5f374c

21 files changed

Lines changed: 1084 additions & 1455 deletions

File tree

.github/workflows/pr.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
name: pr
3+
4+
on:
5+
pull_request:
6+
branches:
7+
- trunk
8+
workflow_dispatch:
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'trunk' && github.sha || 'any-sha' }}
12+
cancel-in-progress: true
13+
14+
env:
15+
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
16+
CARGO_NET_RETRY: 10
17+
CARGO_HTTP_TIMEOUT: 60
18+
CARGO_INCREMENTAL: 0
19+
20+
jobs:
21+
check:
22+
name: cargo check
23+
runs-on: spiceai-dev-runners
24+
timeout-minutes: 60
25+
steps:
26+
- uses: actions/checkout@v6
27+
28+
- name: Setup Rust toolchain
29+
uses: actions-rust-lang/setup-rust-toolchain@v1
30+
with:
31+
toolchain: 1.91
32+
33+
- name: cargo check
34+
run: cargo check --workspace

.github/workflows/run_spicebench.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,21 @@ jobs:
99
runs-on: ubuntu-latest
1010
timeout-minutes: 600
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v6
1313

1414
- uses: ./.github/actions/management-login
1515
with:
1616
client-id: ${{ secrets.SPICE_MANAGEMENT_CLIENT_ID }}
1717
client-secret: ${{ secrets.SPICE_MANAGEMENT_CLIENT_SECRET }}
1818

19-
- name: Install Rust
20-
run: |
21-
echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> $GITHUB_PATH
22-
if [ -d $HOME/.cargo ]; then
23-
source $HOME/.cargo/env || true
24-
fi
25-
if ! command -v rustup &> /dev/null ; then
26-
curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y
27-
source $HOME/.cargo/env || true
28-
fi
29-
rustup toolchain install 1.91
30-
rustup default 1.91
19+
- name: Setup Rust toolchain
20+
uses: actions-rust-lang/setup-rust-toolchain@v1
21+
with:
22+
toolchain: 1.91
3123

3224
- name: Run spicebench
3325
run: |
34-
cargo run -p spicebench -- run \
35-
--ready-wait 180 \
36-
--concurrency 2 \
26+
cargo run -p spicebench -- \
27+
--system-adapter-http-url http://localhost:8080/rpc \
28+
--system-adapter-execution-mode direct-query \
3729
--query-set tpch

0 commit comments

Comments
 (0)