Revert "Merge branch 'master' into 'master'"

This reverts merge request !9
This commit is contained in:
Daniel Garcia Moreno 2017-12-24 13:52:35 +00:00
parent c9fdc1e04c
commit 2e129f4668

View file

@ -19,8 +19,6 @@ 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:
@ -34,8 +32,6 @@ 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
@ -64,8 +60,6 @@ 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: