Skip to content

dist/tools/uf2: Ignore the .json file #20050

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Nov 9, 2023
Merged

dist/tools/uf2: Ignore the .json file #20050

merged 1 commit into from
Nov 9, 2023

Conversation

MrKevinWeiss
Copy link
Contributor

Contribution description

With the updated uf2 tool it seems like the uf2families.json is not ignored, which can be annoying.

Testing procedure

Run:

BUILD_IN_DOCKER=1 BOARD=feather-nrf52840-sense make flash -C examples/hello-world/

and check that the git status no longer shows:

$ git status
On branch master

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        dist/tools/uf2/uf2families.json

Issues/PRs references

@MrKevinWeiss MrKevinWeiss added Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) labels Nov 6, 2023
@MrKevinWeiss MrKevinWeiss added the CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs label Nov 6, 2023
MichelRottleuthner
MichelRottleuthner approved these changes Nov 6, 2023
View reviewed changes
Copy link
Contributor

@MichelRottleuthner MichelRottleuthner left a comment

Choose a reason for hiding this comment

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

ACK

@MichelRottleuthner
Copy link
Contributor

bors merge

@MrKevinWeiss MrKevinWeiss added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Nov 7, 2023
@riot-ci
Copy link

riot-ci commented Nov 7, 2023 •
edited
Loading

Murdock results

✔️ PASSED

85cebf3 dist/tools/uf2: Ignore the .json file

Success Failures Total Runtime
1 0 1 54s

Artifacts

@MrKevinWeiss
Copy link
Contributor Author

bors merge

@kaspar030
Copy link
Contributor

bors ping

@MrKevinWeiss MrKevinWeiss added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Nov 8, 2023
@kaspar030
Copy link
Contributor

please rebase

@MrKevinWeiss
Copy link
Contributor Author

done

@kaspar030 kaspar030 mentioned this pull request Nov 9, 2023
Merged
@kaspar030 kaspar030 added this pull request to the merge queue Nov 9, 2023
Merged via the queue into RIOT-OS:master with commit a2ee19f Nov 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MichelRottleuthner MichelRottleuthner MichelRottleuthner approved these changes

Assignees
No one assigned
Labels
CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@MrKevinWeiss @MichelRottleuthner @riot-ci @kaspar030