Skip to content

Commit 0c28152

Browse files
committed
Review
* Phrasing / spelling * Move controversial bullet points to "Tips" * Adopt `gradlew test` to `gradlew check` in README, following the intent (all tests, incl ITs)
1 parent 55dde60 commit 0c28152

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

CONTRIBUTING.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,44 +76,44 @@ The best way to provide changes is to fork Apache Polaris repository on GitHub a
7676
git checkout -b my-branch
7777
```
7878
* Work on the changes of your pull requests locally.
79-
* Ensure the code is properly formatted:
80-
```bash
81-
./gradlew format
82-
```
83-
* Ensure the code is passing the tests:
79+
* Recommended checks:
8480
```bash
81+
# Ensure the code is properly formatted and compiles:
82+
./gradlew format compileAll
83+
# Ensure the code is passing the checks (including formatting checks & tests):
8584
./gradlew check
8685
```
87-
* You may want to push your changes to your personal Polaris fork. Git will emit a URL that you can use to create the pull request. Do not create the pull request yet.
86+
* You may want to push your changes to your personal Polaris fork. Git will emit a URL that you can use to create the Pull Request. Do not create the Pull Request yet.
8887
```bash
8988
git push --set-upstream your-github-accout
9089
```
9190

92-
#### Opening a pull request
91+
#### Opening a Pull Request
9392

94-
* Before opening a pull request, squash all commits in your branch into a single commit
95-
* Update the subject and message of the commit to match the summary and description of the latter pull-request, GitHub will populate the PR summary and description from the "single" commit.
96-
* Make sure that the summary reflects the targeted area of the code base, for example `docs` or `CI`. Get inspired by [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/).
97-
* The PR description should describe the background of the change and a description of the changes in way that someone who has no prior knowledge can understand the rationale of the change and the change itself.
93+
* The Pull Request summary should provide a concise summary of the change, get inspired by [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/).
94+
* The Pull Request description should provide the background (rationale) of the change and describe the changes in way that someone who has no prior knowledge can understand the rationale of the change and the change itself.
9895
* If there is a matching GitHub Issue, add a separate line at the end of the commit message of the issue that the PR fixes. Do not add the issue number into the subject.
9996
```
10097
Fixes #123456
10198
```
10299
If the PR does not fully fix the issue, use `Related to #123456` instead of `Fixes #123456`.
100+
101+
Tips:
102+
* If the branch for your Pull Request contains only one (squashed) commit, GitHub will populate the PR summary and description from that single commit.
103103
* When opening a PR consider whether the PR is "draft" or already "ready for review". "Draft" means work in progress, things will change, but comments are welcome. "Ready for review" means that the PR is requested to be merged as is (pending review feedback).
104104

105-
#### Working on a pull request
105+
#### Working on a Pull Request
106106

107107
* Don't forget to periodically rebase your branch:
108108
```bash
109109
git pull --rebase
110110
git push your-github-accout my-branch --force
111111
```
112-
* Test that your changes works by adapting or adding tests. Verify the build passes (see `README.md` for build instructions).
112+
* Test that your changes work by adapting or adding tests. Verify the build passes (see `README.md` for build instructions).
113113
* If your Pull Request has conflicts with the `main` branch, please rebase and fix the conflicts.
114114
* If your PR requires more work or time or bigger changes, please put the PR to "draft" state to indicate that it is not meant to be "thoroughly" reviewed at this point.
115115

116-
#### Merging a pull request
116+
#### Merging a Pull Request
117117

118118
* When a PR is about to be merged, cross-check the commit summary and message for the merged Git commit.
119119
* Keep in mind that the Git commit subject and message is going to be read by other people, potentially even after years. The Git commit subject and message will appear "as is" in release notes.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Apache Polaris is built using Gradle with Java 21+ and Docker 27+.
6767

6868
- `./gradlew build` - To build and run tests. Make sure Docker is running, as the integration tests depend on it.
6969
- `./gradlew assemble` - To skip tests.
70-
- `./gradlew test` - To run unit tests and integration tests.
70+
- `./gradlew check` - To run all checks, including unit tests and integration tests.
7171
- `./gradlew run` - To run the Polaris server locally; the server is reachable at localhost:8181. This is also suitable for running regression tests, or for connecting with Spark. Set your own credentials by specifying system property `./gradlew run -Dpolaris.bootstrap.credentials=POLARIS,root,secret` where:
7272
- `POLARIS` is the realm
7373
- `root` is the CLIENT_ID

0 commit comments

Comments
 (0)