gitlabci: Disable normal builds now that tests can run on the flatpak one.

This commit is contained in:
Jordan Petridis 2018-03-19 12:00:53 +02:00
parent 5425ca35b3
commit 28965dc2b1
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6

View File

@ -1,4 +1,5 @@
stages: stages:
- flatpak
- test - test
- lint - lint
@ -39,15 +40,21 @@ stable:test:
# https://hub.docker.com/_/rust/ # https://hub.docker.com/_/rust/
image: "rust" image: "rust"
<<: *cargo_test <<: *cargo_test
only:
- schedule
- web
# nightly:test: nightly:test:
# https://hub.docker.com/r/rustlang/rust/ # https://hub.docker.com/r/rustlang/rust/
# image: "rustlang/rust:nightly" image: "rustlang/rust:nightly"
# <<: *cargo_test <<: *cargo_test
only:
- schedule
- web
flatpak: flatpak:
image: registry.gitlab.com/alatiera/gnome-nightly-oci/rust-bundle:latest image: registry.gitlab.com/alatiera/gnome-nightly-oci/rust-bundle:latest
stage: test stage: flatpak
before_script: before_script:
# https://gitlab.gnome.org/alatiera/Hammond/issues/55 # https://gitlab.gnome.org/alatiera/Hammond/issues/55
- dnf install -y glib2-devel - dnf install -y glib2-devel
@ -93,12 +100,13 @@ rustfmt:
# Configure and run clippy on nightly # Configure and run clippy on nightly
# Only fails on errors atm. # Only fails on errors atm.
# clippy: clippy:
# image: "rustlang/rust:nightly" image: "rustlang/rust:nightly"
# stage: lint stage: lint
# script: script:
# - rustc --version && cargo --version - rustc --version && cargo --version
# - cargo install clippy --force - cargo install clippy --force
# # Force regeneration of gresources regardless of artifacts chage # Force regeneration of gresources regardless of artifacts chage
# - cd hammond-gtk/resources/ && glib-compile-resources --generate resources.xml && cd ../../ - cd hammond-gtk/resources/ && glib-compile-resources --generate resources.xml && cd ../../
# - cargo clippy --all - cargo clippy --all
when: manual