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

Update license automation #522

Merged
merged 1 commit into from
Aug 6, 2024

Conversation

bpmooch
Copy link
Contributor

@bpmooch bpmooch commented Jul 24, 2024

Update automation scripts for adding license headers to files. Also shortens the length of the headers to take up less lines in each file.

Moving forward, when you add new files, simply run make headers before submitting your pull request. You can also manually run DRY_RUN=1 ./hack/headers-write from the root of the repo to get a list of the changes that make headers is going to perform

closes #468

@bpmooch
Copy link
Contributor Author

bpmooch commented Jul 24, 2024

@dmah42 do me a favor and don't add a merge commit if the need comes up

dmah42
dmah42 previously approved these changes Jul 25, 2024
@dmah42
Copy link
Contributor

dmah42 commented Jul 25, 2024

@dmah42 do me a favor and don't add a merge commit if the need comes up

i feel like these three commits can be merged without losing any useful information, and given they fix issues with the first commit maybe a merge is appropriate? :)

@bpmooch
Copy link
Contributor Author

bpmooch commented Jul 29, 2024

@dmah42 do me a favor and don't add a merge commit if the need comes up

i feel like these three commits can be merged without losing any useful information, and given they fix issues with the first commit maybe a merge is appropriate? :)

do you mean squash or merge?

@dmah42
Copy link
Contributor

dmah42 commented Jul 29, 2024

@dmah42 do me a favor and don't add a merge commit if the need comes up

i feel like these three commits can be merged without losing any useful information, and given they fix issues with the first commit maybe a merge is appropriate? :)

do you mean squash or merge?

I don't know... whatever GitHub does... probably squash.

were you asking me not to hit the "update branch" button or not to squash on merge?

@dmah42
Copy link
Contributor

dmah42 commented Jul 29, 2024

I can't see what is causing the failure here. feels like generated code is linting badly. maybe we suppress the lint check?

@bpmooch
Copy link
Contributor Author

bpmooch commented Aug 1, 2024

were you asking me not to hit the "update branch" button or not to squash on merge?

Is it ok to keep the small commits and rebase them over main? I am going to be removing an amount of things in my fork and doing things in small commits helps me maintain parity with upstream

If not, no worries, let's just get this merged and I'll figure it out after

edit: after fiddling with my setup, I can make sure my pr's are squashed to a single commit in the future, sorry for the inconvenience

@bpmooch bpmooch force-pushed the update-license-headers branch 2 times, most recently from 1a12236 to ced6c32 Compare August 1, 2024 03:34
dmah42
dmah42 previously approved these changes Aug 1, 2024
dmah42
dmah42 previously approved these changes Aug 1, 2024
@dmah42
Copy link
Contributor

dmah42 commented Aug 5, 2024

i think rebasing this onto the base branch should resolve the issues.

@bpmooch bpmooch force-pushed the update-license-headers branch from cc1d700 to 4a8babb Compare August 6, 2024 13:40
Update automation scripts for adding license headers to files. Also shortens
the length of the headers to take up less lines in each file.

Moving forward, when you add new files, simply run `make headers` before
submitting your pull request. You can also manually run
`DRY_RUN=1 ./hack/headers-write` from the root of the repo to get a list of the
changes that `make headers` is going to perform
@bpmooch bpmooch force-pushed the update-license-headers branch from 4a8babb to 700773d Compare August 6, 2024 15:24
@dmah42 dmah42 merged commit a3092e9 into aurae-runtime:main Aug 6, 2024
4 checks passed
@dmah42
Copy link
Contributor

dmah42 commented Aug 6, 2024

woo!

@bpmooch bpmooch deleted the update-license-headers branch August 6, 2024 20:34
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.

SPDX License Identifiers in the Source Code
2 participants