Merge branch 'main' into rob/finishing-vec-fs-impl

dcSpark · Jan 26, 2024 · a16f2a1 · a16f2a1
2 parents 152996d + 10cb5ee
commit a16f2a1
Show file tree

Hide file tree

Showing 118 changed files with 5,570 additions and 6,680 deletions.
diff --git a/.github/Dockerfile b/.github/Dockerfile
@@ -1,6 +1,6 @@
 # Use a Rust base image
 FROM rust:bookworm as builder
-RUN apt-get update && apt-get install -y libclang-dev cmake 
+RUN apt-get update && apt-get install -y libclang-dev cmake libssl-dev
 
 # Install nvm, npm and node
 RUN rm /bin/sh && ln -s /bin/bash /bin/sh
@@ -16,7 +16,7 @@ RUN source $NVM_DIR/nvm.sh \
 
 ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
 ENV PATH $NVM_DIR/versions/node/$NODE_VERSION/bin:$PATH
-RUN node -v 
+RUN node -v
 
 # Create a new directory for your app
 WORKDIR /app
@@ -27,7 +27,7 @@ COPY . .
 
 # Build the dependencies (cached)
 
-RUN cargo clean 
+RUN cargo clean
 RUN rustup component add rustfmt
 RUN CARGO_BUILD_RERUN_IF_CHANGED=1 cargo build
 

diff --git a/.gitignore b/.gitignore
@@ -41,3 +41,4 @@ db/.secret
 ./storage/*
 vector_fs_db
 storage
+.vscode/*
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/settings.json b/.vscode/settings.json