-
Notifications
You must be signed in to change notification settings - Fork 547
Update 06 hello world to use shared cargo config #309
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
Update 06 hello world to use shared cargo config #309
Conversation
|
r? @jamesmunns (rust-highfive has picked a reviewer for you, use r? to override) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me, thanks!
| @@ -1,8 +1,11 @@ | |||
| [target.thumbv7em-none-eabihf] | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file should be removed, right? It will clash with #308
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If I'm not mistaken this git showing the deletion of .cargo/config as a "rename", it's confused :) I think when #308 is merged this may change. In anycase there is no src/06-hello-world/.cargo/config in my version of src/06-hello-world.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, GitHub is showing a merge conflict with the src/06-hello-world/.cargo/config file. Could you rebase this to master?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bors r+
|
Merge conflict. |
- Updated `*.md` files. - Deleted the local .cargo/config and openocd.gdb files.
92860a7 to
1fdb1c9
Compare
|
fingers crossed :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's try.
bors r+
|
Build succeeded: |
|
Weird, it looks like the "staging" step took 27+ minutes with the last two PRs. Where as before it was taking half that time and even earlier staging runs were in the 6 minute range. Is there something about the common ../.cargo/config.toml that is slowing things down? |
|
I would tip this is just the throttling on Travis. Sometimes it hangs forever in the schedule queue. |
This is dependent on #308 but there is a reduction in number of lines for 06-hello-world, usually a positive :)