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

CI: Check if files generated by boards.txt.py are up to date #4379

Merged
merged 7 commits into from
Feb 19, 2018

Conversation

igrr
Copy link
Member

@igrr igrr commented Feb 17, 2018

Currently boards.txt, doc/boards.rst, pacakge JSON template, and LD scripts can be updated by boards.txt.py. This PR adds a mechanism to check that these files are committed when changes to boards.txt.py are made. If any difference is found between generated files and files in the repository, CI build will fail like this: https://travis-ci.org/esp8266/Arduino/jobs/342729114.

Additionally, the following tweaks were made:

  • Replace remaining tabs in boards.txt.py with spaces
  • Make LD script output of the script look more like the existing LD scripts
  • Some small formatting/comment tweaks to LD scripts to match generated output
  • Fix issues with the generated JSON output
  • Regenerate package JSON file

Copy link
Collaborator

@d-a-v d-a-v left a comment

Choose a reason for hiding this comment

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

I can see a slight difference: './' is (re)added on 1st line comment in boards.txt when all files are regenerated.
Should TravisCI have seen it ? Travis will see it next commit after merge.

@igrr igrr force-pushed the feature/build_boards_txt_in_ci branch from 9695c23 to ff6a38d Compare February 18, 2018 10:27
@igrr
Copy link
Member Author

igrr commented Feb 18, 2018

I can see a slight difference: './' is (re)added on 1st line comment in boards.txt when all files are regenerated.

This depends on how you run the tool: if you type ./tools/boards.txt.py <args>, it will add the ./. If you run it as tools/boards.txt.py <args>, it will generate the output as in this PR.

I've pushed one more commit which strips that path from script name, so it should always print ...is likely to be overwritten by boards.txt.py regardless of the way the script is invoked.

@igrr igrr merged commit a020e89 into master Feb 19, 2018
@igrr igrr deleted the feature/build_boards_txt_in_ci branch February 19, 2018 09:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants