Skip to content

Commit f7bec01

Browse files
Merge branch 'main' into 150-esdsl-query-context
2 parents 5fea4c3 + 0426b66 commit f7bec01

39 files changed

Lines changed: 3837 additions & 344 deletions

File tree

.github/workflows/rust.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ jobs:
3838
toolchain: stable
3939
components: rustfmt, clippy
4040

41+
- name: Install protoc
42+
run: |
43+
sudo apt-get update
44+
sudo apt-get install -y protobuf-compiler
45+
4146
- name: Run sccache-cache
4247
uses: mozilla-actions/sccache-action@v0.0.4
4348

@@ -48,13 +53,13 @@ jobs:
4853
~/.cargo/registry
4954
~/.cargo/git
5055
target
51-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
56+
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml') }}
5257

5358
- name: Check formatting
5459
run: cargo fmt --all -- --check
5560

5661
- name: Run clippy
57-
run: cargo clippy --workspace --all-targets --all-features -- -D warnings
62+
run: cargo clippy --workspace --all-targets --all-features --locked -- -D warnings
5863
env:
5964
RUSTC_WRAPPER: sccache
6065

@@ -68,6 +73,11 @@ jobs:
6873
with:
6974
toolchain: stable
7075

76+
- name: Install protoc
77+
run: |
78+
sudo apt-get update
79+
sudo apt-get install -y protobuf-compiler
80+
7181
- name: Run sccache-cache
7282
uses: mozilla-actions/sccache-action@v0.0.4
7383

@@ -78,10 +88,10 @@ jobs:
7888
~/.cargo/registry
7989
~/.cargo/git
8090
target
81-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
91+
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml') }}
8292

8393
- name: Run all workspace tests
84-
run: cargo test --workspace
94+
run: cargo test --workspace --locked
8595
env:
8696
RUSTC_WRAPPER: sccache
8797

@@ -98,4 +108,4 @@ jobs:
98108
uses: docker/setup-buildx-action@v3
99109

100110
- name: Build Docker image
101-
run: docker build -f asap-query-engine/Dockerfile -t sketchdb-queryengine-rust:latest .
111+
run: docker build -f asap-query-engine/Dockerfile -t sketchdb-queryengine-rust:latest .

0 commit comments

Comments
 (0)