Skip to content
This repository has been archived by the owner on Jul 3, 2020. It is now read-only.

Commit

Permalink
Bump Nightly version
Browse files Browse the repository at this point in the history
  • Loading branch information
lawliet89 committed Jun 5, 2017
1 parent 5daf7d1 commit 43ac09e
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 63 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sudo: false
language: rust
rust:
- nightly-2017-05-03
- nightly-2017-06-05
- nightly
matrix:
allow_failures:
Expand All @@ -20,9 +20,9 @@ script:
- |
travis-cargo build -- --all-features --all --locked &&
travis-cargo test -- --all-features --all &&
travis-cargo --only nightly-2017-05-03 doc -- --no-deps --all-features --all
travis-cargo --only nightly-2017-06-05 doc -- --no-deps --all-features --all
after_success:
- travis-cargo --only nightly-2017-05-03 doc-upload
- travis-cargo --only nightly-2017-06-05 doc-upload
env:
global:
- TRAVIS_CARGO_NIGHTLY_FEATURE=""
Expand Down
89 changes: 39 additions & 50 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ biscuit = "0.0.4"
chrono = { version = "0.3", features = ["serde"] }
hyper = "0.10"
log = "0.3"
rocket = "= 0.2.6"
rocket_codegen = "= 0.2.6"
rocket = "= 0.2.8"
rocket_codegen = "= 0.2.8"
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
Expand All @@ -46,20 +46,20 @@ uuid = { version = "0.4", features = ["use_std", "serde"] }

# Optional dependencies that are activated by the various features
argon2rs = { version = "0.2.5", optional = true }
clippy = { version = "=0.0.130", optional = true }
clippy = { version = "=0.0.137", optional = true }
csv = { version = "0.15", optional = true }
ldap3 = { version = "0.4.0", optional = true }
ring = { version = "0.9", optional = true } # rust-jwt has this as its dependency
strfmt = { version = "0.1.5", optional = true }

[dependencies.rocket_contrib]
version = "= 0.2.6"
version = "= 0.2.8"
default-features = false
features = ["json", "uuid"]

[dev-dependencies]
serde_test = "1.0"
rocket = { version = "= 0.2.6", features = ["testing"] }
rocket = { version = "= 0.2.8", features = ["testing"] }

[build-dependencies]
ansi_term = "0.9"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM japaric/x86_64-unknown-linux-musl:v0.1.10 as builder
MAINTAINER Yong Wen Chua <[email protected]>
ENV PATH "/root/.cargo/bin:${PATH}"

ARG RUST_VERSION=nightly-2017-05-03
ARG RUST_VERSION=nightly-2017-06-05
ARG ARCHITECTURE=x86_64-unknown-linux-musl
RUN set -x \
&& apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ based off Docker Registry's [authentication protocol](https://docs.docker.com/re
Rocket requires nightly Rust. You should probably install Rust with [rustup](https://www.rustup.rs/), then override the code directory to use nightly instead of stable. See
[installation instructions](https://rocket.rs/guide/getting-started/#installing-rust).

In particular, `rowdy` is currently targetted for `nightly-2017-05-03`.
In particular, `rowdy` is currently targetted for `nightly-2017-06-05`.

## Testing

Expand Down
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use version_check::{is_nightly, is_min_version, is_min_date};

// Specifies the minimum nightly version that is targetted
// Note that sometimes the `rustc` date might be older than the nightly version, usually one day older
const MIN_DATE: &'static str = "2017-05-02";
const MIN_DATE: &'static str = "2017-06-04";
const MIN_VERSION: &'static str = "1.19.0-nightly";

// Convenience macro for writing to stderr.
Expand Down
4 changes: 2 additions & 2 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ doc = false
[dependencies]
docopt = "0.7"
log = "0.3"
rocket = "= 0.2.6"
rocket_codegen = "= 0.2.6"
rocket = "= 0.2.8"
rocket_codegen = "= 0.2.8"
rowdy = { path = "../", features = ["simple_authenticator", "ldap_authenticator"] }
rustc-serialize = "0.3"
serde = "1.0"
Expand Down

0 comments on commit 43ac09e

Please sign in to comment.