gitlabci: Enable the ubuntu/rust stable build, disable tests in flatpak

Due to meson not understanding cargo, it's actually faster to have
a separate build + test job than trying to compile the cargo
tests twice inside the flatpak enviroment
This commit is contained in:
Jordan Petridis 2018-03-27 10:04:02 +03:00
parent 192b13e393
commit 822a72efde
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6

View File

@ -1,5 +1,4 @@
stages: stages:
- flatpak
- test - test
- lint - lint
@ -36,15 +35,12 @@ stages:
- target/ - target/
- .cargo_cache/ - .cargo_cache/
stable:test: rust:stable:
# https://hub.docker.com/_/rust/ # https://hub.docker.com/_/rust/
image: "rust" image: "rust"
<<: *cargo_test <<: *cargo_test
only:
- schedule
- web
nightly:test: rust:nightly:
# 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
@ -54,7 +50,7 @@ nightly:test:
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: flatpak stage: test
script: script:
- flatpak-builder --stop-at=hammond app org.gnome.Hammond.json - flatpak-builder --stop-at=hammond app org.gnome.Hammond.json
# https://gitlab.gnome.org/alatiera/Hammond/issues/55 # https://gitlab.gnome.org/alatiera/Hammond/issues/55
@ -70,8 +66,8 @@ flatpak:
# Create a flatpak bundle # Create a flatpak bundle
- flatpak build-bundle repo hammond-dev.flatpak org.gnome.Hammond - flatpak build-bundle repo hammond-dev.flatpak org.gnome.Hammond
# Run the tests # Run the tests
- flatpak-builder --run app org.gnome.Hammond.json cargo test --release -- --test-threads=1 # - flatpak-builder --run app org.gnome.Hammond.json cargo test -- --test-threads=1
- flatpak-builder --run app org.gnome.Hammond.json cargo test --release -- --test-threads=1 --ignored # - flatpak-builder --run app org.gnome.Hammond.json cargo test -- --test-threads=1 --ignored
artifacts: artifacts:
paths: paths: