Merge branch 'master' into 'master'

Fix bug CI config bug.

See merge request danigm/fractal!9
This commit is contained in:
Daniel Garcia Moreno 2017-12-24 12:37:57 +00:00
commit c9fdc1e04c

View file

@ -19,6 +19,8 @@ test:stable:
image: "rust" image: "rust"
script: script:
- rustc --version && cargo --version - rustc --version && cargo --version
# Force regeneration of gresources regardless of artifacts chage
- cd fractal-gtk/resources/ && glib-compile-resources --generate resources.xml && cd ../../
- cargo build --all - cargo build --all
- cargo test --all --verbose - cargo test --all --verbose
cache: cache:
@ -32,6 +34,8 @@ test:nightly:
image: "rustlang/rust:nightly" image: "rustlang/rust:nightly"
script: script:
- rustc --version && cargo --version - rustc --version && cargo --version
# Force regeneration of gresources regardless of artifacts chage
- cd fractal-gtk/resources/ && glib-compile-resources --generate resources.xml && cd ../../
- cargo build --all - cargo build --all
- cargo test --all --verbose - cargo test --all --verbose
# - cargo bench # - cargo bench
@ -60,6 +64,8 @@ lint:clippy:
image: "rustlang/rust:nightly" image: "rustlang/rust:nightly"
script: script:
- rustc --version && cargo --version - rustc --version && cargo --version
# Force regeneration of gresources regardless of artifacts chage
- cd fractal-gtk/resources/ && glib-compile-resources --generate resources.xml && cd ../../
- cargo install clippy - cargo install clippy
- cargo clippy --all - cargo clippy --all
cache: cache: