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

The Magenta kernel is now called Zircon. #44612

Merged
merged 15 commits into from
Sep 25, 2017

Conversation

pylaligand
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @dtolnay (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@pylaligand
Copy link
Contributor Author

Hi there! I hope I caught all the instances, but haven't been able to run tests yet. Any guidance on how to produce appropriate test coverage would be much appreciated.

@mattico
Copy link
Contributor

mattico commented Sep 15, 2017

You can set ALLOW_PR=1 in

- env: IMAGE=dist-fuchsia DEPLOY=1

To let you test this on travis before r+

@dtolnay
Copy link
Member

dtolnay commented Sep 17, 2017

Tier 2 platform + senior Google employee working on platform + everything in this PR only affects that platform = do what you want, I guess. 😜 r=me after removing ALLOW_PR=1.

@bors
Copy link
Contributor

bors commented Sep 17, 2017

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

@carols10cents carols10cents added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 18, 2017
@pylaligand
Copy link
Contributor Author

Rebased, but it looks like I picked up some submodules changes. Not sure what to make of these.

@pylaligand
Copy link
Contributor Author

I think I fixed the submodules issue.

@pylaligand
Copy link
Contributor Author

pylaligand commented Sep 18, 2017

@dtolnay, could you approve this change? I removed the Travis testing bit and rebased.

@dtolnay
Copy link
Member

dtolnay commented Sep 18, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Sep 18, 2017

📌 Commit 9f0cd9e has been approved by dtolnay

@pylaligand
Copy link
Contributor Author

pylaligand commented Sep 19, 2017

Thanks for the approval @dtolnay. What's the next step, will the bot check the change in? Sorry for pressing, but this is blocking some of our work over in Fuchsialand.

@dtolnay
Copy link
Member

dtolnay commented Sep 19, 2017

Yep, the bot will merge as soon as the build passes against the merge commit. That ensures the master branch is always a commit that has passed all CI (the "not rocket science" approach to CI). I'm not really familiar with this UI but here is the current queue: https://buildbot2.rust-lang.org/homu/queue/rust

@bors
Copy link
Contributor

bors commented Sep 19, 2017

⌛ Testing commit 9f0cd9ea03f26d98c452694a6c04a8c6b6587581 with merge 62b24094ffa0320bedd21ab33f9d0bb5da853b20...

@bors
Copy link
Contributor

bors commented Sep 19, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Sep 19, 2017

The download-toolchain script failed on Fuchsia. There is no unzip command?

[00:05:25] + ./zircon/scripts/download-toolchain
[00:05:25] Downloading https://fuchsia-build.storage.googleapis.com/magenta/toolchain/x86_64-elf/Linux-x86_64/509cd48809f5252ffc8ef0c72dbf208151750f66
######################################################################## 100.0%
[00:05:25] Unpacking /tmp/zircon/prebuilt/downloads/x86_64-elf-Linux-x86_64.tar.bz2
[00:05:32] Downloading https://fuchsia-build.storage.googleapis.com/magenta/toolchain/aarch64-elf/Linux-x86_64/509cd48809f5252ffc8ef0c72dbf208151750f66
######################################################################## 100.0%
[00:05:32] Unpacking /tmp/zircon/prebuilt/downloads/aarch64-elf-Linux-x86_64.tar.bz2
[00:05:39] Downloading https://storage.googleapis.com/fuchsia/clang/linux-amd64/86d57720455e2d6aff2b48f9cea3ef77ab2af06a
######################################################################## 100.0%
[00:05:40] Unpacking /tmp/zircon/prebuilt/downloads/clang+llvm-x86_64-linux.zip
[00:05:40] ./zircon/scripts/download-toolchain: line 121: unzip: command not found
[00:05:40] The command '/bin/sh -c /tmp/build-toolchain.sh' returned a non-zero code: 127

@pylaligand
Copy link
Contributor Author

@petrhosek see error above.

@pylaligand
Copy link
Contributor Author

Does this need another approval or will the bot pick it up again?

@kennytm
Copy link
Member

kennytm commented Sep 19, 2017

Yes it needs another approval.

r? @dtolnay

@dtolnay
Copy link
Member

dtolnay commented Sep 19, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Sep 19, 2017

📌 Commit 23ef8fd has been approved by dtolnay

@dtolnay
Copy link
Member

dtolnay commented Sep 19, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Sep 19, 2017

📌 Commit fbcb0a5 has been approved by dtolnay

@arielb1 arielb1 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 19, 2017
@raggi
Copy link
Contributor

raggi commented Sep 20, 2017

@dtolnay thanks for plugging away with us. I just pushed a rebase and and update of liblibc, which should fix the linker failure. When I tested this locally, it looks like liblibc 0.2.31 has dependencies on other submodules that would need to be updated, but I'm not sure which ones. Would appreciate seeing if it builds in the bots, as my local build may be different.

petrhosek and others added 3 commits September 24, 2017 13:55
This toolchain is already used to build Zircon itself and is the
official Clang toolchain used by all Fuchsia developers.
This appears to be needed by the Rust build.
@raggi
Copy link
Contributor

raggi commented Sep 24, 2017

Rebased and fixed up, I think those changes might even fix our build issue. Ever hopeful.

@dtolnay
Copy link
Member

dtolnay commented Sep 24, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Sep 24, 2017

📌 Commit c481f85 has been approved by dtolnay

@dtolnay
Copy link
Member

dtolnay commented Sep 24, 2017

If you need to push any more changes and the new changes only affect the fuchsia target, leave a comment @bors r=dtolnay and the bot will build it without waiting for me to review.

@bors
Copy link
Contributor

bors commented Sep 24, 2017

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Sep 24, 2017

📌 Commit c481f85 has been approved by `dtolnay``

@bors
Copy link
Contributor

bors commented Sep 25, 2017

⌛ Testing commit c481f85 with merge b2968acc726d5d33ab4ad4a768d16bfd7eee94a4...

@bors
Copy link
Contributor

bors commented Sep 25, 2017

💔 Test failed - status-travis

 * Adjust bootstrap to provide useful output on failure
 * Add missing package dependencies in the build environment
 * Fix permission bits on prebuilt toolchain files
@raggi
Copy link
Contributor

raggi commented Sep 25, 2017

@bors r=dtolnay

@bors
Copy link
Contributor

bors commented Sep 25, 2017

@raggi: 🔑 Insufficient privileges: Not in reviewers

@dtolnay
Copy link
Member

dtolnay commented Sep 25, 2017

Oh I didn't know about that. I will try to find out whether there is a way to delegate review permission.

@bors r+

@bors
Copy link
Contributor

bors commented Sep 25, 2017

📌 Commit a3aef1a has been approved by dtolnay

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Sep 25, 2017

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Sep 25, 2017

📌 Commit a3aef1a has been approved by alexcrichton

@alexcrichton
Copy link
Member

@bors: delegate=raggi

@bors
Copy link
Contributor

bors commented Sep 25, 2017

✌️ @raggi can now approve this pull request

@bors
Copy link
Contributor

bors commented Sep 25, 2017

⌛ Testing commit a3aef1a with merge cd93969...

bors added a commit that referenced this pull request Sep 25, 2017
The Magenta kernel is now called Zircon.
@bors
Copy link
Contributor

bors commented Sep 25, 2017

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

@bors bors merged commit a3aef1a into rust-lang:master Sep 25, 2017
@raggi
Copy link
Contributor

raggi commented Sep 25, 2017

Thanks again folks for all your patience and assistance.

@kennytm kennytm mentioned this pull request Oct 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.