Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minimal versions build #5757

Merged
merged 10 commits into from
Jul 24, 2018
Merged

Minimal versions build #5757

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
adc8b5d
update min dependencies to build with minimal-versions
Eh2406 Jul 20, 2018
f5ced93
add to CI
Eh2406 Jul 20, 2018
17e0140
test is ambitious let's start with check
Eh2406 Jul 20, 2018
8a7123c
update min dependencies to build with minimal-versions on windows
Eh2406 Jul 21, 2018
f6a29a7
clarify synthetic nature of dep
Eh2406 Jul 21, 2018
96d3c05
typo
Eh2406 Jul 23, 2018
16bbb95
separate Travis builder
Eh2406 Jul 23, 2018
3fa032b
separate AppVeyor builder
Eh2406 Jul 23, 2018
2797f6c
Use nightly for `-Z` but use `MSRV=stable` for test
Eh2406 Jul 23, 2018
4a8c70e
update curl so we don't need so may hacks
Eh2406 Jul 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ matrix:
install:
- mdbook --help || cargo install mdbook --force
script:
- cargo +nightly generate-lockfile -Z minimal-versions
- cargo check --tests
- cargo +nightly generate-lockfile
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our "best practices" I think for this was to set this on a new travis matrix entry with the minimum supported Rust version, right? Should that be done here?

I'm somewhat hesitant to do this for Cargo though in the sense that we don't really have a minimum supported Rust version, it's always stable and forward for Cargo.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ya I was figuring that since we don't have a MRV we could just combine it.

- cargo test
- cargo doc --no-deps
- (cd src/doc && mdbook build --dest-dir ../../target/doc)
Expand Down
13 changes: 9 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,18 @@ failure = "0.1.1"
filetime = "0.2"
flate2 = "1.0"
fs2 = "0.4"
git2 = "0.7.0"
git2 = "0.7.2"
git2-curl = "0.8.1"
libgit2-sys = "0.7.5" # required only for minimal-versions. brought in by git2 and git2-curl.
libssh2-sys = "0.2.8" # required only for minimal-versions. brought in by libgit2-sys.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I published new versions of libgit2/git2-rs, so could those new versions be used instead of adding synthetic deps here?

glob = "0.2.11"
hex = "0.3"
home = "0.3"
ignore = "0.4"
lazy_static = "1.0.0"
jobserver = "0.1.9"
jobserver = "0.1.11"
lazycell = "1.0"
libc = "0.2"
libgit2-sys = "0.7.1"
log = "0.4"
num_cpus = "1.0"
rustfix = "0.4"
Expand All @@ -64,7 +65,11 @@ num-traits = "0.2" # enable the default feature
core-foundation = { version = "0.6.0", features = ["mac_os_10_7_support"] }

[target.'cfg(windows)'.dependencies]
miow = "0.3"
miow = "0.3.1"

[target.'cfg(windows)'.dev-dependencies]
gcc = "0.3.23" # required only for minimal-versions on windows. brought in by flate2 and others.
cmake = "0.1.24" # required only for minimal-versions on windows. brought in as build-dependencie on libgit2-sys.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo "build-dependencie"


[target.'cfg(windows)'.dependencies.winapi]
version = "0.3"
Expand Down
3 changes: 3 additions & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,7 @@ clone_depth: 1
build: false

test_script:
- cargo generate-lockfile -Z minimal-versions
- cargo check --tests
- cargo generate-lockfile
- cargo test