ci: remove separate futures build

This commit is contained in:
Felix Krull 2019-08-28 00:59:43 +02:00 committed by Colin Walters
parent 3597c3c38b
commit 39532d4160
1 changed files with 3 additions and 10 deletions

View File

@ -44,22 +44,14 @@ check:
ostree: ostree:
<<: *build-step <<: *build-step
variables: variables:
# 2019.2 still hasn't been backported # TODO: update
FEATURES: --features v2018_9 FEATURES: --features v2018_9,futures
ostree_default-features: ostree_default-features:
<<: *build-step <<: *build-step
variables: variables:
FEATURES: "" FEATURES: ""
ostree_futures:
<<: *build-step
image: rustlang/rust:nightly
variables:
FEATURES: --features v2018_9,futures
script:
- cargo test --verbose ${FEATURES}
# docs # docs
docs: docs:
stage: build stage: build
@ -72,6 +64,7 @@ docs:
--extern-html-root-url gio_sys=https://gtk-rs.org/docs --extern-html-root-url gio_sys=https://gtk-rs.org/docs
--extern-html-root-url glib=https://gtk-rs.org/docs --extern-html-root-url glib=https://gtk-rs.org/docs
--extern-html-root-url gio=https://gtk-rs.org/docs --extern-html-root-url gio=https://gtk-rs.org/docs
before_script: []
script: script:
- make merge-lgpl-docs - make merge-lgpl-docs
- cargo rustdoc --verbose --package ostree-sys --features dox -- ${RUSTDOC_OPTS} - cargo rustdoc --verbose --package ostree-sys --features dox -- ${RUSTDOC_OPTS}