Skip to content

Conversation

@winksaville
Copy link
Contributor

This is dependent on #308 but there is a reduction in number of lines for 06-hello-world, usually a positive :)

@winksaville winksaville requested a review from a team as a code owner March 5, 2021 23:30
@rust-highfive
Copy link

r? @jamesmunns

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-resources labels Mar 5, 2021
Copy link
Member

@eldruin eldruin left a 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]
Copy link
Member

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

Copy link
Contributor Author

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.

Copy link
Member

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?

eldruin
eldruin previously approved these changes Mar 9, 2021
Copy link
Member

@eldruin eldruin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bors r+

@bors
Copy link
Contributor

bors bot commented Mar 9, 2021

Merge conflict.

 - Updated `*.md` files.
 - Deleted the local .cargo/config and openocd.gdb files.
@winksaville winksaville force-pushed the Update-06-hello-world-to-use-shared-cargo-config branch from 92860a7 to 1fdb1c9 Compare March 9, 2021 10:38
@winksaville
Copy link
Contributor Author

fingers crossed :)

Copy link
Member

@eldruin eldruin left a 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+

@bors
Copy link
Contributor

bors bot commented Mar 9, 2021

Build succeeded:

@bors bors bot merged commit bc34d73 into rust-embedded:master Mar 9, 2021
@winksaville
Copy link
Contributor Author

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?

@eldruin
Copy link
Member

eldruin commented Mar 9, 2021

I would tip this is just the throttling on Travis. Sometimes it hangs forever in the schedule queue.

@winksaville winksaville deleted the Update-06-hello-world-to-use-shared-cargo-config branch March 9, 2021 17:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-resources

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants