Skip to content

Fix spurious error in dirty_both_lib_and_test.#6756

Merged
bors merged 1 commit into
rust-lang:masterfrom
ehuss:fix-dirty_both_lib_and_test
Mar 19, 2019
Merged

Fix spurious error in dirty_both_lib_and_test.#6756
bors merged 1 commit into
rust-lang:masterfrom
ehuss:fix-dirty_both_lib_and_test

Conversation

@ehuss

@ehuss ehuss commented Mar 16, 2019

Copy link
Copy Markdown
Contributor

On HFS, if it runs fast enough, the mtimes will be equal, causing it to fail to rebuild.

Seen on #6755 https://travis-ci.com/rust-lang/cargo/jobs/185412514

@rust-highfive

Copy link
Copy Markdown

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 16, 2019
@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Mar 18, 2019

Copy link
Copy Markdown
Contributor

📌 Commit 0b4303d has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 18, 2019
@bors

bors commented Mar 18, 2019

Copy link
Copy Markdown
Contributor

⌛ Testing commit 0b4303d with merge 5af9fe9ab84d9a8e685ba38a335274250121521f...

@bors

bors commented Mar 18, 2019

Copy link
Copy Markdown
Contributor

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 18, 2019
@ehuss

ehuss commented Mar 18, 2019

Copy link
Copy Markdown
Contributor Author

Appveyor is having an incident (https://status.appveyor.com/incidents/6wvjng6gr54s). Probably should wait until they say it's clear.

@ehuss

ehuss commented Mar 19, 2019

Copy link
Copy Markdown
Contributor Author

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 19, 2019
@bors

bors commented Mar 19, 2019

Copy link
Copy Markdown
Contributor

⌛ Testing commit 0b4303d with merge 0643c49...

bors added a commit that referenced this pull request Mar 19, 2019
Fix spurious error in dirty_both_lib_and_test.

On HFS, if it runs fast enough, the mtimes will be equal, causing it to fail to rebuild.

Seen on #6755 https://travis-ci.com/rust-lang/cargo/jobs/185412514
@bors

bors commented Mar 19, 2019

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-travis, status-appveyor
Approved by: alexcrichton
Pushing 0643c49 to master...

@bors bors merged commit 0b4303d into rust-lang:master Mar 19, 2019
bors added a commit to rust-lang/rust that referenced this pull request Mar 30, 2019
Update cargo

Update cargo

22 commits in 0e35bd8af0ec72d3225c4819b330b94628f0e9d0..63231f438a2b5b84ccf319a5de22343ee0316323
2019-03-13 06:52:51 +0000 to 2019-03-27 12:26:45 +0000
- Code cleanup (rust-lang/cargo#6787)
- Add cargo:rustc-link-arg to pass custom linker arguments (rust-lang/cargo#6298)
- Testsuite: remove some unnecessary is_nightly checks. (rust-lang/cargo#6786)
- cargo metadata: Don't show `null` deps. (rust-lang/cargo#6534)
- Some fingerprint cleanup. (rust-lang/cargo#6785)
- Fix fingerprint for canceled build script. (rust-lang/cargo#6782)
- Canonicalize default target if it ends with `.json` (rust-lang/cargo#6778)
- Fix setting `panic=unwind` compiling lib a extra time. (rust-lang/cargo#6781)
- Always nicely show errors from crates.io if possible (rust-lang/cargo#6771)
- Testsuite: Make `cwd()` relative to project root. (rust-lang/cargo#6768)
- Allow `cargo fix` if gitignore matches root working dir. (rust-lang/cargo#6767)
- Remove redundant imports (rust-lang/cargo#6763)
- Handle backcompat hazard with `toml` crate (rust-lang/cargo#6761)
- Fix spurious error in dirty_both_lib_and_test. (rust-lang/cargo#6756)
- Update toml requirement from 0.4.2 to 0.5.0 (rust-lang/cargo#6760)
- Reuse std::env::consts::EXE_SUFFIX (rust-lang/cargo#6758)
- Proptest 0.9.1 (rust-lang/cargo#6753)
- Don't need extern crate in 2018 (rust-lang/cargo#6752)
- Release a jobserver token while locking a file (rust-lang/cargo#6748)
- Minor doc fix for publish command synopsis (rust-lang/cargo#6749)
- Stricter package change detection. (rust-lang/cargo#6740)
- Fix resolving yanked crates when using a local registry. (rust-lang/cargo#6742)
@ehuss ehuss added this to the 1.35.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants