Skip to content
Snippets Groups Projects
Commit 5a4fcfcc authored by Éloïs's avatar Éloïs
Browse files

Merge branch 'ci_beta' into 'dev'

fix build in beta toolchain

See merge request !79
parents 4de16b57 f6260020
No related branches found
No related tags found
1 merge request!79fix build in beta toolchain
...@@ -19,12 +19,13 @@ variables: ...@@ -19,12 +19,13 @@ variables:
- rustc --version && cargo --version - rustc --version && cargo --version
.rust_beta_env: &rust_beta_env .rust_beta_env: &rust_beta_env
image: parity/rust:gitlab-ci
tags: tags:
- redshift-rs-beta - redshift-rs-stable
before_script: before_script:
- export PATH="$HOME/.cargo/bin:$PATH" - export PATH="$HOME/.cargo/bin:$PATH"
- rustup update - rustup default beta
- rustc --version && cargo --version - rustup show && rustc --version && cargo --version
.rust_nightly_env: &rust_nightly_env .rust_nightly_env: &rust_nightly_env
image: rustlang/rust:nightly image: rustlang/rust:nightly
...@@ -69,6 +70,7 @@ fmt: ...@@ -69,6 +70,7 @@ fmt:
<<: *rust_nightly_env <<: *rust_nightly_env
stage: fmt stage: fmt
before_script: before_script:
- rustup show
- rustup component add rustfmt-preview --toolchain nightly - rustup component add rustfmt-preview --toolchain nightly
script: script:
- cargo fmt -- --check - cargo fmt -- --check
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment