Skip to content

Updated locked version of libgit2#42246

Merged
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:update-cargo
May 29, 2017
Merged

Updated locked version of libgit2#42246
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:update-cargo

Conversation

@alexcrichton

Copy link
Copy Markdown
Member

This should include a fix for rust-lang/cargo#4091 with an updated version of
libgit2.

Closes rust-lang/cargo#4091

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

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

@nikomatsakis

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented May 26, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 1a9c7b2 has been approved by nikomatsakis

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 26, 2017
…tsakis

Updated locked version of libgit2

This should include a fix for rust-lang/cargo#4091 with an updated version of
libgit2.

Closes rust-lang/cargo#4091
@shepmaster shepmaster added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 27, 2017
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 27, 2017
…tsakis

Updated locked version of libgit2

This should include a fix for rust-lang/cargo#4091 with an updated version of
libgit2.

Closes rust-lang/cargo#4091
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 27, 2017
…tsakis

Updated locked version of libgit2

This should include a fix for rust-lang/cargo#4091 with an updated version of
libgit2.

Closes rust-lang/cargo#4091
bors added a commit that referenced this pull request May 27, 2017
Rollup of 10 pull requests

- Successful merges: #42103, #42137, #42162, #42167, #42175, #42207, #42217, #42246, #42249, #42251
- Failed merges:
@Mark-Simulacrum

Copy link
Copy Markdown
Member

Possibly caused by this:

[01:07:14] ---- ssh_something_happens stdout ----
[01:07:14] 	running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo build -v`
[01:07:14] thread 'ssh_something_happens' panicked at '
[01:07:14] Expected: execs
[01:07:14]     but: expected to find:
[01:07:14] Caused by:
[01:07:14]   [[..]] Failed to start SSH session: Failed getting banner
[01:07:14] 
[01:07:14] 
[01:07:14] did not find in output:
[01:07:14]     Updating git repository `ssh://127.0.0.1:45463/foo/bar`
[01:07:14] error: failed to load source for a dependency on `bar`
[01:07:14] 
[01:07:14] Caused by:
[01:07:14]   Unable to update ssh://127.0.0.1:45463/foo/bar
[01:07:14] 
[01:07:14] Caused by:
[01:07:14]   failed to clone into: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t1/home/.cargo/git/db/bar-5b585494ba4e14e6
[01:07:14] 
[01:07:14] Caused by:
[01:07:14]   [23/-1] failed to start SSH session: Failed getting banner
[01:07:14] ', /cargo/registry/src/github.com-1ecc6299db9ec823/hamcrest-0.1.1/src/core.rs:31
[01:07:14] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:07:14] 
[01:07:14] 
[01:07:14] failures:
[01:07:14]     ssh_something_happens

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 28, 2017
…tsakis

Updated locked version of libgit2

This should include a fix for rust-lang/cargo#4091 with an updated version of
libgit2.

Closes rust-lang/cargo#4091
@Mark-Simulacrum

Mark-Simulacrum commented May 28, 2017

Copy link
Copy Markdown
Member

@bors r-

I am now 95% sure that this causes the above failure:

[01:06:02]      Running build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/build_auth-681d1f230bae11b8
[01:06:02] 
[01:06:02] running 3 tests
[01:06:02] test ssh_something_happens ... FAILED
[01:06:02] test https_something_happens ... ok
[01:06:02] test http_auth_offered ... ok
[01:06:02] 
[01:06:02] failures:
[01:06:02] 
[01:06:02] ---- ssh_something_happens stdout ----
[01:06:02] 	running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo build -v`
[01:06:02] thread 'ssh_something_happens' panicked at '
[01:06:02] Expected: execs
[01:06:02]     but: expected to find:
[01:06:02] Caused by:
[01:06:02]   [[..]] Failed to start SSH session: Failed getting banner
[01:06:02] 
[01:06:02] 
[01:06:02] did not find in output:
[01:06:02]     Updating git repository `ssh://127.0.0.1:37962/foo/bar`
[01:06:02] error: failed to load source for a dependency on `bar`
[01:06:02] 
[01:06:02] Caused by:
[01:06:02]   Unable to update ssh://127.0.0.1:37962/foo/bar
[01:06:02] 
[01:06:02] Caused by:
[01:06:02]   failed to clone into: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t2/home/.cargo/git/db/bar-66fdece68bd893fc
[01:06:02] 
[01:06:02] Caused by:
[01:06:02]   [23/-1] failed to start SSH session: Failed getting banner
[01:06:02] ', /cargo/registry/src/github.com-1ecc6299db9ec823/hamcrest-0.1.1/src/core.rs:31
[01:06:02] note: Run with `RUST_BACKTRACE=1` for a backtrace.

@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r=nikomatsakis

@bors

bors commented May 28, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 4fbcba5 has been approved by nikomatsakis

@kennytm

kennytm commented May 28, 2017

Copy link
Copy Markdown
Member

Travis-CI failed during make prepare

[00:00:28] error: the lock file needs to be updated but --frozen was passed to prevent this
[00:00:28] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:00:28] Build completed unsuccessfully in 0:00:26

@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r- per the above

This should include a fix for rust-lang/cargo#4091 with an updated version of
libgit2.

Closes rust-lang/cargo#4091
@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r=nikomatsakis

@bors

bors commented May 28, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 3146d9f has been approved by nikomatsakis

@alexcrichton alexcrichton force-pushed the update-cargo branch 2 times, most recently from e925003 to 3146d9f Compare May 28, 2017 17:41
@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r=nikomatsakis

@bors

bors commented May 28, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 3146d9f has been approved by nikomatsakis

@bors

bors commented May 29, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 3146d9f with merge 9111927...

bors added a commit that referenced this pull request May 29, 2017
Updated locked version of libgit2

This should include a fix for rust-lang/cargo#4091 with an updated version of
libgit2.

Closes rust-lang/cargo#4091
@bors

bors commented May 29, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 9111927 to master...

@bors bors merged commit 3146d9f into rust-lang:master May 29, 2017
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.

"cargo new" executed in a drive root hangs

7 participants