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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace]
resolver = "2"
resolver = "3"
members = [
"bindings/c",
"bindings/wasm",
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ FROM chef AS builder
ARG BUILD_DEBUG=false
ENV CARGO_PROFILE_RELEASE_DEBUG=$BUILD_DEBUG
COPY --from=planner /recipe.json recipe.json
RUN cargo chef cook --release --recipe-path recipe.json
RUN cargo chef cook --release --locked --recipe-path recipe.json
COPY . .
ARG ENABLE_FEATURES=""
RUN if [ "$ENABLE_FEATURES" == "" ]; then \
cargo build -p libsql-server --release ; \
cargo build -p libsql-server --release --locked ; \
else \
cargo build -p libsql-server --features "$ENABLE_FEATURES" --release ; \
cargo build -p libsql-server --features "$ENABLE_FEATURES" --release --locked ; \
fi
RUN cargo build -p bottomless-cli --release
RUN cargo build -p bottomless-cli --release --locked

# official gosu install instruction (https://github.com/tianon/gosu/blob/master/INSTALL.md)
FROM debian:bullseye-slim as gosu
Expand Down
2 changes: 2 additions & 0 deletions libsql-sqlite3/ext/crr/rs/bundle/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,5 @@ omit_load_extension = [
"crsql_fractindex_core/omit_load_extension",
"crsql_core/omit_load_extension"
]

[workspace]
2 changes: 2 additions & 0 deletions libsql-sqlite3/ext/crr/rs/bundle_static/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,5 @@ static = [
omit_load_extension = [
"crsql_bundle/omit_load_extension"
]

[workspace]
2 changes: 2 additions & 0 deletions libsql-sqlite3/ext/crr/rs/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ libsql = []
loadable_extension = ["sqlite_nostd/loadable_extension"]
static = ["sqlite_nostd/static"]
omit_load_extension = ["sqlite_nostd/omit_load_extension"]

[workspace]
2 changes: 2 additions & 0 deletions libsql-sqlite3/ext/crr/rs/fractindex-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ target = "wasm32-unknown-emscripten"
loadable_extension = ["sqlite_nostd/loadable_extension"]
static = ["sqlite_nostd/static"]
omit_load_extension = ["sqlite_nostd/omit_load_extension"]

[workspace]
2 changes: 2 additions & 0 deletions libsql-sqlite3/ext/crr/rs/integration_check/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ cc = "1.0"
libsql = ["crsql_bundle/libsql"]
static = []
omit_load_extension = []

[workspace]
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ sqlite3_capi = {version="0.1.0", path="../sqlite3_capi"}

# dev dependencies for examples
[dev-dependencies]

[workspace]
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ bindgen = "0.68.1"
loadable_extension = []
static = []
omit_load_extension = []

[workspace]
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ num-derive = "0.4.1"
loadable_extension = ["sqlite3_capi/loadable_extension"]
static = ["sqlite3_capi/static"]
omit_load_extension = ["sqlite3_capi/omit_load_extension"]

[workspace]
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ sqlite_nostd = { path="../sqlite_nostd"}
loadable_extension = ["sqlite_nostd/loadable_extension"]
static = ["sqlite_nostd/static"]


[workspace]
6 changes: 6 additions & 0 deletions libsql-sqlite3/test/rust_suite/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ name = "libsql_rust_suite"
version = "0.2.0"
edition = "2021"

# This crate is its own workspace root with no committed Cargo.lock, so CI
# resolves it from scratch every run. resolver = "3" makes that resolution
# MSRV-aware (it honors the 1.85.0 toolchain in rust-toolchain.toml) so it does
# not pull in deps that require a newer compiler (e.g. icu_*/idna_adapter @ 1.86,
# wasip2/wit-bindgen @ 1.87).
[workspace]
resolver = "3"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
Loading