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.

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

Reenable Travis CI. #166

Merged
merged 1 commit into from
Nov 2, 2017
Merged

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Oct 27, 2017

  1. Merged the two original .travis.yml inside the subpackages to the top level.

  2. Fixed several issues which prevented Travis from passing:

    1. Disabled site/tests/lib.rs due to site/tests/lib.rs is outdated #165. (Thus currently cargo test does absolutely nothing 🤷‍)
    2. Fixed the workspace issue when trying to run collector/check-benchmarks.sh.
    3. Repurpose collector/check-benchmarks.sh for Travis checking only (removed set -x and added some travis_fold). I think for development most people would run the collector directly.

@Mark-Simulacrum Mark-Simulacrum self-assigned this Oct 29, 2017
@Mark-Simulacrum
Copy link
Member

Will collector still be part of the workspace with the current changes?

@kennytm
Copy link
Member Author

kennytm commented Oct 30, 2017

Yes. (I think this may be a misfeature of Cargo.)

https://travis-ci.org/rust-lang-nursery/rustc-perf/jobs/293550642#L861

@Mark-Simulacrum
Copy link
Member

So we'd be depending on a bug, sort of?

@kennytm
Copy link
Member Author

kennytm commented Oct 30, 2017

@Mark-Simulacrum Yeah... the bug seems to be rust-lang/cargo#4089. There is a fix at rust-lang/cargo#4297 but it has been sitting there for 3 months? Perhaps we could hold this off until the bug is fixed on nightly.

Or we could remove the top-level workspace.

@Mark-Simulacrum
Copy link
Member

Hm, it looks like maybe it was fixed by rust-lang/cargo#4594?

@kennytm
Copy link
Member Author

kennytm commented Nov 1, 2017

@Mark-Simulacrum Nope, the description states

This is the first step of the fix, that's only a codemod to put together the relevant parts : workspace.members, workspace.excludes, and the root_dir (where members and excludes are relative to). There's no logic change in this PR to keep review easier.

@Mark-Simulacrum Mark-Simulacrum merged commit bbcfded into rust-lang:master Nov 2, 2017
@kennytm kennytm deleted the fix-travis branch November 2, 2017 23:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants