Skip to content
New issue

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

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

Already on GitHub? # to your account

Restore creating the channel-rust-$channel-date.txt files #40225

Merged
merged 2 commits into from
Mar 11, 2017

Conversation

shepmaster
Copy link
Member

I have not run this (because I don't know how to 😇), but it does compile.

r? @alexcrichton

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Mar 3, 2017

📌 Commit b601b75 has been approved by alexcrichton

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 3, 2017
… r=alexcrichton

Restore creating the channel-rust-$channel-date.txt files

I have **not** run this (because I don't know how to 😇), but it *does* compile.

r? @alexcrichton
@bors
Copy link
Collaborator

bors commented Mar 4, 2017

☔ The latest upstream changes (presumably #39917) made this pull request unmergeable. Please resolve the merge conflicts.

@shepmaster shepmaster force-pushed the restore-build-date-file branch from b601b75 to cac4bf3 Compare March 4, 2017 15:08
@shepmaster
Copy link
Member Author

@alexcrichton I've rebased to address #39917; note that there's now an extra commit to deal with what appears to be variables that weren't fully renamed.

@alexcrichton
Copy link
Member

@bors: r+

Thanks!

@bors
Copy link
Collaborator

bors commented Mar 6, 2017

📌 Commit cac4bf3 has been approved by alexcrichton

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 8, 2017
… r=alexcrichton

Restore creating the channel-rust-$channel-date.txt files

I have **not** run this (because I don't know how to 😇), but it *does* compile.

r? @alexcrichton
@bors
Copy link
Collaborator

bors commented Mar 9, 2017

🔒 Merge conflict

@shepmaster shepmaster force-pushed the restore-build-date-file branch from cac4bf3 to 3e2390f Compare March 9, 2017 13:53
@shepmaster
Copy link
Member Author

Merge conflict (that I didn't see locally) fixed.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Mar 9, 2017

📌 Commit 3e2390f has been approved by alexcrichton

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 9, 2017
… r=alexcrichton

Restore creating the channel-rust-$channel-date.txt files

I have **not** run this (because I don't know how to 😇), but it *does* compile.

r? @alexcrichton
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 9, 2017
… r=alexcrichton

Restore creating the channel-rust-$channel-date.txt files

I have **not** run this (because I don't know how to 😇), but it *does* compile.

r? @alexcrichton
@bors
Copy link
Collaborator

bors commented Mar 9, 2017

⌛ Testing commit 3e2390f with merge ab212f1...

@alexcrichton
Copy link
Member

@bors: retry

(need another PR to land)

@bors
Copy link
Collaborator

bors commented Mar 10, 2017

⌛ Testing commit 3e2390f with merge 059c757...

@bors
Copy link
Collaborator

bors commented Mar 10, 2017

💔 Test failed - status-travis

@arielb1
Copy link
Contributor

arielb1 commented Mar 10, 2017

Cargo problem:

ar: creating archive ../../libcrypto.aar: 

../libcrypto.a: Inappropriate file type or format

make[2]: *** [../libcrypto.a] Error 1

@shepmaster
Copy link
Member Author

@arielb1 that seems unrelated to my change. Do you know if there's something I need to address?

@alexcrichton
Copy link
Member

@bors: retry

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 10, 2017
… r=alexcrichton

Restore creating the channel-rust-$channel-date.txt files

I have **not** run this (because I don't know how to 😇), but it *does* compile.

r? @alexcrichton
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 10, 2017
… r=alexcrichton

Restore creating the channel-rust-$channel-date.txt files

I have **not** run this (because I don't know how to 😇), but it *does* compile.

r? @alexcrichton
arielb1 pushed a commit to arielb1/rust that referenced this pull request Mar 10, 2017
… r=alexcrichton

Restore creating the channel-rust-$channel-date.txt files

I have **not** run this (because I don't know how to 😇), but it *does* compile.

r? @alexcrichton
arielb1 pushed a commit to arielb1/rust that referenced this pull request Mar 10, 2017
… r=alexcrichton

Restore creating the channel-rust-$channel-date.txt files

I have **not** run this (because I don't know how to 😇), but it *does* compile.

r? @alexcrichton
arielb1 pushed a commit to arielb1/rust that referenced this pull request Mar 10, 2017
… r=alexcrichton

Restore creating the channel-rust-$channel-date.txt files

I have **not** run this (because I don't know how to 😇), but it *does* compile.

r? @alexcrichton
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 11, 2017
… r=alexcrichton

Restore creating the channel-rust-$channel-date.txt files

I have **not** run this (because I don't know how to 😇), but it *does* compile.

r? @alexcrichton
@bors bors merged commit 3e2390f into rust-lang:master Mar 11, 2017
@shepmaster shepmaster deleted the restore-build-date-file branch April 25, 2018 19:28
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants