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

8346046: Enable copyright header format check #22721

Closed
wants to merge 3 commits into from

Conversation

zhaosongzs
Copy link
Member

@zhaosongzs zhaosongzs commented Dec 12, 2024

As requested in SKARA-1357, now skara bot is able to check the copyright header format.
Now I am going to update the jcheck configuration to configure copyright check as an error.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (2 reviews required, with at least 1 Reviewer, 1 Author)

Issue

  • JDK-8346046: Enable copyright header format check (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/22721/head:pull/22721
$ git checkout pull/22721

Update a local copy of the PR:
$ git checkout pull/22721
$ git pull https://git.openjdk.org/jdk.git pull/22721/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22721

View PR using the GUI difftool:
$ git pr show -t 22721

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/22721.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 12, 2024

👋 Welcome back zsong! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Dec 12, 2024

@zhaosongzs This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8346046: Enable copyright header format check

Reviewed-by: erikj, iris, dholmes

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 53 new commits pushed to the master branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@erikj79, @irisclark, @dholmes-ora) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot changed the title 8346046 8346046: Enable copyright header format check Dec 12, 2024
@openjdk
Copy link

openjdk bot commented Dec 12, 2024

@zhaosongzs The following label will be automatically applied to this pull request:

  • build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the build build-dev@openjdk.org label Dec 12, 2024
@zhaosongzs zhaosongzs marked this pull request as ready for review December 12, 2024 23:42
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 12, 2024
@mlbridge
Copy link

mlbridge bot commented Dec 12, 2024

Webrevs

Copy link
Member

@erikj79 erikj79 left a comment

Choose a reason for hiding this comment

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

I think this looks ok, but would like input from at least another reviewer.

/reviewers 2

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 13, 2024
@openjdk
Copy link

openjdk bot commented Dec 13, 2024

@erikj79
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 1 Reviewer, 1 Author).

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Dec 13, 2024
.jcheck/conf Outdated
@@ -34,3 +34,8 @@ pattern=^([124-8][0-9]{6}): (\S.*)$

[checks "problemlists"]
dirs=test/jdk|test/langtools|test/lib-test|test/hotspot/jtreg|test/jaxp

[checks "copyright"]
files=^(?!LICENSE|license\.txt|.*\.bin|.*\.gif|.*\.jpg|.*\.png|.*\.patch|.*\.wav|.*\.class|.*-header|.*\.jar|).*
Copy link
Member

Choose a reason for hiding this comment

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

IIUC there are other special files that could be excluded here: .icon, .tiff, .dat

But, again IIUC, this is just an optimization as the check would be "if the file has what appears to be an Oracle copyright, then validate the format". So binary files would not have it and so would not be validated.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, your understanding is correct. Additionally, Skara won't attempt to check binary files.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 13, 2024
@zhaosongzs
Copy link
Member Author

Thank you all for the reviews!
/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 16, 2024
@openjdk
Copy link

openjdk bot commented Dec 16, 2024

@zhaosongzs
Your change (at version 62a2643) is now ready to be sponsored by a Committer.

@erikj79
Copy link
Member

erikj79 commented Dec 17, 2024

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 17, 2024

Going to push as commit 18d1d61.
Since your change was applied there have been 61 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 17, 2024
@openjdk openjdk bot closed this Dec 17, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Dec 17, 2024
@openjdk
Copy link

openjdk bot commented Dec 17, 2024

@erikj79 @zhaosongzs Pushed as commit 18d1d61.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants