From e40f880b9e1f25e6e469d206373097c75592e4c7 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Thu, 10 May 2018 18:38:51 +0300 Subject: [PATCH] gitlabci: Use prebuilt clippy image Since clippy won't fail to install now that it's bundled in the container image also do not allow the to fail --- .gitlab-ci.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f69bc6..cfabb03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,17 +96,13 @@ rustfmt: # Configure and run clippy on nightly # Only fails on errors atm. clippy: - image: "rustlang/rust:nightly" + image: "registry.gitlab.gnome.org/alatiera/hammond-container-images/clippy:nightly" stage: lint variables: RUSTFLAGS: "--cfg rayon_unstable" - before_script: - - apt-get update -yqq - - apt-get install -yqq --no-install-recommends build-essential libgtk-3-dev meson script: - rustc --version && cargo --version - - cargo install clippy --force + - cargo clippy --version # Force regeneration of gresources regardless of artifacts chage - cd hammond-gtk/resources/ && glib-compile-resources --generate resources.xml && cd ../../ - - cargo clippy --all - allow_failure: true + - cargo clippy --all \ No newline at end of file