Skip to content

Formatting #226

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

Merged
merged 4 commits into from
Sep 13, 2023
Merged

Formatting #226

merged 4 commits into from
Sep 13, 2023

Conversation

dsweber2
Copy link
Contributor

This just applies style_pkg() to the whole package. There's also a github action to automatically format any push; I'm less certain that will 100% work, because testing github actions is kind of a mess.

@dsweber2
Copy link
Contributor Author

The last error is just because the styler doesn't have permissions to actually make a commit. The previous one was because of the same error as my other pull request, but this is now strictly based on that one

@dajmcdon
Copy link
Contributor

Just to be clear, this PR seems to do 3 things:

  1. Add .git-blame-ignore-revs. There's a commit hash in that file. How exactly does this work?
  2. Add a Github action that should automatically style all future PRs.
  3. Apply the action to the current main.

Is that right?

@dsweber2
Copy link
Contributor Author

Yes, that's a good summary.
it's very similar to .gitignore. if the flag --ignore-revs is passed to git blame, or other git history commands, any change from that commit is ignored. This is to make it so that not everything is attributed to who or whatever is doing the styling, and history diffs can ignore it (much like they would other whitespace changes).

@dajmcdon
Copy link
Contributor

dajmcdon commented Sep 9, 2023

@dsweber2 can you handle the conflicts above, or should I?

@dsweber2
Copy link
Contributor Author

dsweber2 commented Sep 9, 2023

Got it; best handled via local rebase; I also added the revised commit to .git-ignore-revs.

The tests are broken on main btw. I think I reproduced exactly the same errors, but its hard to tell.

@dajmcdon
Copy link
Contributor

If you merge main into this, then checks should pass. I'll merge this once it's ready.

@dsweber2
Copy link
Contributor Author

alright, tests pass! And the new code on main is formatted

Copy link
Contributor

@dajmcdon dajmcdon left a comment

Choose a reason for hiding this comment

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

OK. Merge when ready.

@dsweber2 dsweber2 merged commit 6e1d3ea into cmu-delphi:main Sep 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants