diff options
| -rw-r--r-- | .drone.yml | 20 | ||||
| -rw-r--r-- | script/builder_image/Dockerfile | 2 |
2 files changed, 16 insertions, 6 deletions
@@ -36,8 +36,19 @@ steps: branch: - nonexistent_skip_this_step + - name: code quality + image: superboum/garage_builder_amd64:4 + volumes: + - name: cargo_home + path: /drone/cargo + environment: + CARGO_HOME: /drone/cargo + commands: + - cargo fmt -- --check + - cargo clippy -- --deny warnings + - name: build - image: superboum/garage_builder_amd64:3 + image: superboum/garage_builder_amd64:4 volumes: - name: cargo_home path: /drone/cargo @@ -45,11 +56,10 @@ steps: CARGO_HOME: /drone/cargo commands: - pwd - - cargo fmt -- --check - cargo build - name: cargo-test - image: superboum/garage_builder_amd64:3 + image: superboum/garage_builder_amd64:4 volumes: - name: cargo_home path: /drone/cargo @@ -85,7 +95,7 @@ steps: - nonexistent_skip_this_step - name: smoke-test - image: superboum/garage_builder_amd64:3 + image: superboum/garage_builder_amd64:4 volumes: - name: cargo_home path: /drone/cargo @@ -129,6 +139,6 @@ steps: --- kind: signature -hmac: d584c2a15ede6d5702fbe27ae5ae2b2bf7a04461ae7aed2d53cbda83b7fd503e +hmac: e919f8a66d20ebfeeec56b291a8a0fdd59a482601da987fcf533d96d24768744 ... diff --git a/script/builder_image/Dockerfile b/script/builder_image/Dockerfile index 00dea191..908c7e3c 100644 --- a/script/builder_image/Dockerfile +++ b/script/builder_image/Dockerfile @@ -3,5 +3,5 @@ RUN apt-get update && \ apt-get install --yes libsodium-dev awscli python-pip wget rclone openssl socat && \ rm -rf /var/lib/apt/lists/* RUN wget https://dl.min.io/client/mc/release/linux-amd64/mc -O /usr/local/bin/mc && chmod +x /usr/local/bin/mc -RUN rustup component add rustfmt +RUN rustup component add rustfmt clippy RUN pip install s3cmd |