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 copyright years to 2024 #2842

Merged
merged 2 commits into from
Feb 16, 2024

Conversation

beelchester
Copy link
Contributor

@beelchester beelchester commented Feb 9, 2024

Fixes: #2800
Made separate commits for:

  1. Changing the update-copyright.py script to include libgrust.
  2. Updating copyright years in gcc/rust and libgrust.

@beelchester beelchester force-pushed the update_copyright_years branch from a84aa97 to 64cec9b Compare February 9, 2024 06:23
@dkm
Copy link
Member

dkm commented Feb 9, 2024

Thank you for this. Some notes...

"3300 files changes" => This alone should be a hint that maybe, something's odd. And indeed, you are modifying many many files outside of the rust frontend. These files need to be "bumped", but in fact, they already have... in the upstream repository. Our version is still in 2023 because we haven't merged upstream for some times now.

You changes will cause trouble when we actually merge upstream, as both upstream and us are modifying the same locations.

So, bottom line: don't touch any files outside of gcc/rust and libgrust/ for bumping the copyright date.

The only change you have to do outside of these 2 dir is for modifying the script responsible for the bump:

  • 1 commit for the script
  • 1 commit for bumping rust (and only rust) copyright years

If you see that some other files need to be bumped outside the rust directories, that could be part of a followup change.

Also, we need commit messages. For the script, a regular GNU changelog part is needed. For the commit that only bumps the year, you can use the "Update copyright years" comment (see previous year) that is recognized by the checkers (and you don't need to add a gazilion lines of GNU changelog for every files).

@beelchester beelchester marked this pull request as draft February 9, 2024 08:17
@beelchester beelchester force-pushed the update_copyright_years branch 2 times, most recently from d347c13 to 93ade1a Compare February 11, 2024 11:23
@beelchester beelchester marked this pull request as ready for review February 11, 2024 11:24
@beelchester beelchester force-pushed the update_copyright_years branch 2 times, most recently from c9c2e1a to 1454560 Compare February 11, 2024 13:00
Copy link
Member

@CohenArthur CohenArthur left a comment

Choose a reason for hiding this comment

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

this looks good, thanks :) but you'll need to fix the formatting for both commits, which the commit format checker complains about:

Checking 14545605e35ecc9be022efa89cd6f28079e7d36c: FAILED
ERR: cannot find a ChangeLog location in message
Checking 017758e8eca260e5443ba8c6afee56fe38d17d92: FAILED
ERR: line should start with a tab: "* update-copyright.py: Add libgrust folder."

For the first issue, you need to add a period to the end of your commit message, so Update copyright years.. This is what the commit format script checks for:

        # Skip Update copyright years commits
        if self.info.lines and self.info.lines[0] == 'Update copyright years.':
            return

(note the period at the end).

for the second commit, as the error says you need to use a tabulation instead of spaces characters before the mentioned line. sorry about this!

@beelchester beelchester force-pushed the update_copyright_years branch 3 times, most recently from 4f2991e to 0dfa6fd Compare February 15, 2024 20:48
contrib/ChangeLog:
	* update-copyright.py: Add libgrust folder.

Signed-off-by: Sahil Yeole <[email protected]>
Signed-off-by: Sahil Yeole <[email protected]>
Copy link
Member

@CohenArthur CohenArthur left a comment

Choose a reason for hiding this comment

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

thanks @sahilyeole, great job :)

@CohenArthur CohenArthur added this pull request to the merge queue Feb 16, 2024
Merged via the queue into Rust-GCC:master with commit b01124f Feb 16, 2024
9 checks passed
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.

Update copyright to 2024
3 participants