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

DO NOT Merge - Test shard cargo config and openocd.gdb #307

Conversation

winksaville
Copy link
Contributor

Created src/.cargo/config.toml which references ../openocd.gdb which
is the src/openocd.gdb.

Create src/openocd.gdb which is the most general openocd.gdb defined by
any of the chapters

Tested 05, 06 and 07 locally and this seems to work and also ran
TRAVIS_BRANCH=hello bash ci/script.sh which seemed to work.

Changed src/05-led-roulette/.cargo/config to config.tomol and have it
be an "empty" cargo config by commenting out the assignment statements.
This represents one possibility. Also, we need to decide what to do
about local openocd.gdb files.

Renamed all .cargo/config to ./cargo/config.original so as to "prove"
they are not needed locally.

Created src/.cargo/config.toml which references `../openocd.gdb` which
is the src/openocd.gdb.

Create src/openocd.gdb which is the most general openocd.gdb defined by
any of the chapters

Tested 05, 06 and 07 locally and this seems to work and also ran
TRAVIS_BRANCH=hello bash ci/script.sh which seemed to work.

Changed src/05-led-roulette/.cargo/config to config.tomol and have it
be an "empty" cargo config by commenting out the assignment statements.
This represents one possibility. Also, we need to decide what to do
about local openocd.gdb files.

Renamed all .cargo/config to ./cargo/config.original so as to "prove"
they are not needed locally.
@rust-highfive
Copy link

r? @andre-richter

(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 3, 2021
@winksaville winksaville changed the title Test shard cargo config and openocd.gdb DO NOT Merge - Test shard cargo config and openocd.gdb Mar 3, 2021
@winksaville
Copy link
Contributor Author

I'd like to propose we add embedded-discover/src/.cargo/config.toml and embedded-discovery/src/openocd.gdb this will make it easier for the user. As it stands now if the users system doesn't have arm-none-eabi-gdb installed they have to change every .cargo/config file in each of the chapters. By moving .carog/config.toml and openocd.gdb to src/ it only has to be changed in one place.

If this is acceptable I'll chnge 05-roulette/flash-it to direct the user to update embedded-discover/src/.cargo/config.toml to the appropriate runner = line in the "Update .cargo/config" section.

The other thing to do is decide is what to do with the src/*/.cargo/config and src/*/openocd.gdb. AFAICT we can just remove them. We could also just "comment out" the contents or ...

Please give me feed back!

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.

Thank you!
In my opinion, one central file seems simpler for the reasons you listed. I would also just remove all other files since we have better ways for people to start a new project than to copy a small subproject from this book.

PS: In GitHub you can mark a PR which is not ready to be merged as a "draft PR" and later as ready when it is.

@eldruin
Copy link
Member

eldruin commented Jul 18, 2021

This was merged in #308

@eldruin eldruin closed this Jul 18, 2021
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