From c998a66a462ddf1dfc944a926a5cae9b5189610b Mon Sep 17 00:00:00 2001 From: alyssa Date: Thu, 2 Jan 2025 02:45:27 +0000 Subject: [PATCH] fix(ci): specify new rust crates path --- .dockerignore | 6 ++---- ci/Dockerfile.rust | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.dockerignore b/.dockerignore index 3f669a4f..678f2b7b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,12 +3,10 @@ # Include project code and build files !PluralKit.*/ -!services/ -!lib/ !Myriad/ !.git -!proto !dashboard +!crates/ !Cargo.toml !Cargo.lock @@ -25,4 +23,4 @@ **/node_modules # don't clear docker cache when updating dockerfiles -Dockerfile \ No newline at end of file +Dockerfile diff --git a/ci/Dockerfile.rust b/ci/Dockerfile.rust index 6c9cca92..0452cb4b 100644 --- a/ci/Dockerfile.rust +++ b/ci/Dockerfile.rust @@ -23,9 +23,7 @@ RUN cargo chef cook --release --recipe-path recipe.json --target x86_64-unknown- COPY Cargo.toml /build/ COPY Cargo.lock /build/ -# this needs to match workspaces in Cargo.toml -COPY lib /build/lib -COPY services/ /build/services +COPY crates/ /build/crates RUN cargo build --bin api --release --target x86_64-unknown-linux-musl RUN cargo build --bin dispatch --release --target x86_64-unknown-linux-musl