From 6d5a3512766b27511cceacbfadca9dccb9d705da Mon Sep 17 00:00:00 2001 From: Klaus Purer Date: Sun, 1 Apr 2018 20:18:09 +0200 Subject: [PATCH 1/5] test(travis): Test build with minimal versions --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index f036981901a..6cd473cc217 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,9 @@ matrix: - cargo test - cargo doc --no-deps - (cd src/doc && mdbook build --dest-dir ../../target/doc) + # Make sure building cargo works with minimum dependency versions. + - ./target/debug/cargo update -Z minimal-versions + - cargo build exclude: - rust: stable From 18c36daa9948a432679b1ad4e898e99d07f8d366 Mon Sep 17 00:00:00 2001 From: Klaus Purer Date: Sun, 1 Apr 2018 21:08:00 +0200 Subject: [PATCH 2/5] chore(dependencies): Bump curl to v0.4.9 to prevent build errors with minimal versions --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index fc9b48a90ac..ff3d49d36e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ atty = "0.2" crates-io = { path = "src/crates-io", version = "0.16" } crossbeam = "0.3" crypto-hash = "0.3" -curl = "0.4.6" +curl = "0.4.9" env_logger = "0.5" failure = "0.1.1" filetime = "0.2" From 9c67c923e20cca28be37733d00183208f6a38a1c Mon Sep 17 00:00:00 2001 From: Klaus Purer Date: Mon, 16 Apr 2018 20:07:03 +0200 Subject: [PATCH 3/5] chore(dependencies): Bumb minimum dependency versions that are required to build cargo --- .travis.yml | 4 +++- Cargo.toml | 16 ++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6cd473cc217..aaaee431065 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,9 @@ matrix: - cargo doc --no-deps - (cd src/doc && mdbook build --dest-dir ../../target/doc) # Make sure building cargo works with minimum dependency versions. - - ./target/debug/cargo update -Z minimal-versions + # Use a custom fork of the registry index for now because the main one + # is missing "links" entries. + - CARGO_REGISTRY_INDEX=https://github.com/klausi/crates.io-index cargo update -Z minimal-versions - cargo build exclude: diff --git a/Cargo.toml b/Cargo.toml index ff3d49d36e1..43d2bb574bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,16 +20,16 @@ path = "src/cargo/lib.rs" atty = "0.2" crates-io = { path = "src/crates-io", version = "0.16" } crossbeam = "0.3" -crypto-hash = "0.3" -curl = "0.4.9" -env_logger = "0.5" +crypto-hash = ">=0.3.1, <0.4.0" +curl = "0.4.12" +env_logger = ">=0.5.4, <0.6.0" failure = "0.1.1" filetime = "0.2" flate2 = "1.0" fs2 = "0.4" git2 = "0.7.0" -git2-curl = "0.8" -glob = "0.2" +git2-curl = ">=0.8.1, <0.9.0" +glob = ">=0.2.11, <0.3.0" hex = "0.3" home = "0.3" ignore = "0.4" @@ -37,7 +37,7 @@ lazy_static = "1.0.0" jobserver = "0.1.9" lazycell = "0.6" libc = "0.2" -libgit2-sys = "0.7" +libgit2-sys = ">=0.7.1, <0.8.0" log = "0.4" num_cpus = "1.0" same-file = "1" @@ -47,10 +47,10 @@ serde_derive = "1.0" serde_ignored = "0.0.4" serde_json = "1.0" shell-escape = "0.1" -tar = { version = "0.4", default-features = false } +tar = { version = ">=0.4.9, <0.5.0", default-features = false } tempfile = "3.0" termcolor = "0.3" -toml = "0.4" +toml = ">=0.4.2, <0.5.0" url = "1.1" clap = "2.31.2" From 6760478a9da85ab6093d08698486af92d8f489a9 Mon Sep 17 00:00:00 2001 From: Klaus Purer Date: Sat, 21 Apr 2018 00:29:07 +0200 Subject: [PATCH 4/5] chore(dependencies): Simplify version ranges and bump tar minimal version --- Cargo.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 43d2bb574bf..5217104ebb6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,16 +20,16 @@ path = "src/cargo/lib.rs" atty = "0.2" crates-io = { path = "src/crates-io", version = "0.16" } crossbeam = "0.3" -crypto-hash = ">=0.3.1, <0.4.0" +crypto-hash = "0.3.1" curl = "0.4.12" -env_logger = ">=0.5.4, <0.6.0" +env_logger = "0.5.4" failure = "0.1.1" filetime = "0.2" flate2 = "1.0" fs2 = "0.4" git2 = "0.7.0" -git2-curl = ">=0.8.1, <0.9.0" -glob = ">=0.2.11, <0.3.0" +git2-curl = "0.8.1" +glob = "0.2.11" hex = "0.3" home = "0.3" ignore = "0.4" @@ -37,7 +37,7 @@ lazy_static = "1.0.0" jobserver = "0.1.9" lazycell = "0.6" libc = "0.2" -libgit2-sys = ">=0.7.1, <0.8.0" +libgit2-sys = "0.7.1" log = "0.4" num_cpus = "1.0" same-file = "1" @@ -47,10 +47,10 @@ serde_derive = "1.0" serde_ignored = "0.0.4" serde_json = "1.0" shell-escape = "0.1" -tar = { version = ">=0.4.9, <0.5.0", default-features = false } +tar = { version = "0.4.15", default-features = false } tempfile = "3.0" termcolor = "0.3" -toml = ">=0.4.2, <0.5.0" +toml = "0.4.2" url = "1.1" clap = "2.31.2" From f0202d23b30a57e564018eb54784aff5aa0d01c1 Mon Sep 17 00:00:00 2001 From: Klaus Purer Date: Sat, 21 Apr 2018 01:30:41 +0200 Subject: [PATCH 5/5] fix(travis): Make sure build really runs with minimal versions --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index aaaee431065..50ba7b67e0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,8 +38,7 @@ matrix: # Make sure building cargo works with minimum dependency versions. # Use a custom fork of the registry index for now because the main one # is missing "links" entries. - - CARGO_REGISTRY_INDEX=https://github.com/klausi/crates.io-index cargo update -Z minimal-versions - - cargo build + - CARGO_REGISTRY_INDEX=https://github.com/klausi/crates.io-index cargo build -Z minimal-versions exclude: - rust: stable