Skip to content
This repository has been archived by the owner on Apr 24, 2024. It is now read-only.

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use old workaround, install make
Browse files Browse the repository at this point in the history
4ydan committed Jul 19, 2023
1 parent 3fc99aa commit 434fb01
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion ci/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -121,7 +121,8 @@ timeout(time: 2, unit: 'HOURS') {
try {
stage('Sanity') {
parallel(
"cargo-fmt": runDockerWithPostgresSidecar('cargo fmt --check'),
// Workaround: we can't stop rustfmt from linting the generated schema.rs so we empty the file before.
"cargo-fmt": runDockerWithPostgresSidecar("/bin/bash -c 'echo \"\" > src/schema.rs && cargo fmt --check"),
"schema": runDockerWithPostgresSidecar('echo schema test', 'backend/src/schema.rs', 'schema.rs'),
"migration": runDockerWithPostgresSidecar(determineMigration()),
failFast: true
2 changes: 1 addition & 1 deletion ci/container-images/permaplant-rust/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM rust:1.67.1-slim

RUN apt update && apt install -y libpq-dev libssl-dev pkg-config postgresql-client
RUN apt update && apt install -y make libpq-dev libssl-dev pkg-config postgresql-client
RUN rustup component add clippy rustfmt
RUN cargo install diesel_cli@2.0.1 --no-default-features --features postgres
RUN cargo install typeshare-cli

0 comments on commit 434fb01

Please sign in to comment.