Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/correctness.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable

- name: Install protoc
- name: Install protoc and HiGHS build deps
run: |
sudo apt-get update -qq
sudo apt-get install -y protobuf-compiler
sudo apt-get install -y protobuf-compiler cmake libclang-dev

- name: Run sccache
uses: mozilla-actions/sccache-action@v0.0.4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ jobs:
toolchain: stable
components: rustfmt, clippy

- name: Install protoc
- name: Install protoc and HiGHS build deps
run: |
sudo apt-get update
sudo apt-get install -y protobuf-compiler
sudo apt-get install -y protobuf-compiler cmake libclang-dev

- name: Run sccache-cache
uses: mozilla-actions/sccache-action@v0.0.4
Expand Down Expand Up @@ -82,10 +82,10 @@ jobs:
with:
toolchain: stable

- name: Install protoc
- name: Install protoc and HiGHS build deps
run: |
sudo apt-get update
sudo apt-get install -y protobuf-compiler
sudo apt-get install -y protobuf-compiler cmake libclang-dev

- name: Run sccache-cache
uses: mozilla-actions/sccache-action@v0.0.4
Expand Down
197 changes: 197 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions asap-planner-rs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ indexmap.workspace = true
chrono.workspace = true
promql-parser = "0.5.0"
reqwest = { version = "0.11", features = ["blocking", "json"] }
rqe-optimizer = { git = "https://github.com/ProjectASAP/sketch-bench", branch = "main" }

[dev-dependencies]
tempfile = "3.20"
Expand Down
5 changes: 4 additions & 1 deletion asap-planner-rs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ LABEL description="ASAP Planner (Rust) for SketchDB"

WORKDIR /code

# Required by prost-build dependencies during cargo build
# protobuf-compiler: prost-build. cmake, libclang-dev: HiGHS (rqe-optimizer's MILP solver).
RUN apt-get update && apt-get install -y --no-install-recommends \
protobuf-compiler \
cmake \
libclang-dev \
&& rm -rf /var/lib/apt/lists/*

COPY asap-common ./asap-common
Expand Down Expand Up @@ -42,6 +44,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
libssl3 \
zlib1g \
libstdc++6 \
&& rm -rf /var/lib/apt/lists/*

RUN mkdir -p /app/input /app/output
Expand Down
Loading
Loading