Skip to content

Commit

Permalink
Fresher 2025-01-20
Browse files Browse the repository at this point in the history
  • Loading branch information
meowjesty committed Jan 21, 2025
1 parent e33d962 commit 40bb68b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions mirrord/agent/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ COPY Cargo.toml Cargo.lock CHANGELOG.md README.md LICENSE rust-toolchain.toml /a
# so we remove from the workspace
RUN sed -i '/members = \[/,/\]/c\members = [\n "mirrord/*",\n]' /app/Cargo.toml

RUN cargo +nightly-2025-01-15 chef prepare --recipe-path recipe.json
RUN cargo +nightly-2025-01-20 chef prepare --recipe-path recipe.json

FROM chef AS builder

COPY --from=planner /app/recipe.json recipe.json
RUN cargo +nightly-2025-01-15 chef cook --release --zigbuild --target $(cat /.platform) --recipe-path recipe.json
RUN cargo +nightly-2025-01-20 chef cook --release --zigbuild --target $(cat /.platform) --recipe-path recipe.json

# Copy order is important here, since we want the cache to be invalidated as less as possible
# so we start with the most static files, then the most dynamic ones
Expand All @@ -44,7 +44,7 @@ COPY Cargo.toml Cargo.lock CHANGELOG.md README.md LICENSE rust-toolchain.toml /a
# so we remove from the workspace
RUN sed -i '/members = \[/,/\]/c\members = [\n "mirrord/*",\n]' /app/Cargo.toml

RUN cargo +nightly-2025-01-15 zigbuild -Z bindeps --manifest-path /app/mirrord/agent/Cargo.toml --target $(cat /.platform) --release
RUN cargo +nightly-2025-01-20 zigbuild -Z bindeps --manifest-path /app/mirrord/agent/Cargo.toml --target $(cat /.platform) --release
RUN cp /app/target/$(cat /.platform)/release/mirrord-agent /mirrord-agent

FROM ghcr.io/metalbear-co/ci-agent-runtime:latest
Expand Down
6 changes: 3 additions & 3 deletions mirrord/cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ RUN cargo install [email protected]
FROM chef AS planner

COPY . /build/
RUN cargo +nightly-2025-01-15 chef prepare --recipe-path recipe.json
RUN cargo +nightly-2025-01-20 chef prepare --recipe-path recipe.json

FROM chef AS builder

COPY --from=planner /build/recipe.json recipe.json
RUN cargo +nightly-2025-01-15 chef cook --release --zigbuild --target $(cat /.platform) --recipe-path recipe.json
RUN cargo +nightly-2025-01-20 chef cook --release --zigbuild --target $(cat /.platform) --recipe-path recipe.json

COPY . /build/
RUN cargo +nightly-2025-01-15 zigbuild -p mirrord -p mirrord-layer -Z bindeps --target $(cat /.platform) --release --locked
RUN cargo +nightly-2025-01-20 zigbuild -p mirrord -p mirrord-layer -Z bindeps --target $(cat /.platform) --release --locked
RUN cp /build/target/$(cat /.platform)/release/mirrord /mirrord
RUN cp /build/target/$(cat /.platform)/release/libmirrord_layer.so /libmirrord_layer.so

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2025-01-15"
channel = "nightly-2025-01-20"
components = [ "rustfmt", "clippy", "rustc" ]
profile = "minimal"

0 comments on commit 40bb68b

Please sign in to comment.