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

Create a Pull Request Template for the project #2387

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

paularah
Copy link
Contributor

Fixes: #1929

Adds a pull request template to provide information on how to contribute to Tetragon.

Adds a pull request template to provide information on how to contribute to Tetragon.
@paularah paularah requested a review from a team as a code owner April 28, 2024 02:52
@paularah paularah requested a review from tixxdz April 28, 2024 02:52
@lambdanis lambdanis added the release-note/misc This PR makes changes that have no direct user impact. label Apr 29, 2024
Copy link
Contributor

@lambdanis lambdanis left a comment

Choose a reason for hiding this comment

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

Thank you @paularah 🙇‍♀️

I left one small suggestion. Also, you need to amend the commit message in order to pass the CI - write a title and add a sign-off. Your PR contains instructions on how to do that :)


- [ ] For first time contributors, read [Submitting a pull request](https://tetragon.io/docs/contribution-guide/submitting-a-pull-request/).
- [ ] All code is covered by unit and/or end-to-end tests tests where feasible.
- [ ] All commits contain a well written commit description including a title,
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
- [ ] All commits contain a well written commit description including a title,
- [ ] All commits contain a well written commit message including a title,

Copy link
Member

Choose a reason for hiding this comment

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

plus commit log

Copy link
Member

@tixxdz tixxdz left a comment

Choose a reason for hiding this comment

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

LGTM when @lambdanis and other comments are fixed.

Thank you ;-)


- [ ] For first time contributors, read [Submitting a pull request](https://tetragon.io/docs/contribution-guide/submitting-a-pull-request/).
- [ ] All code is covered by unit and/or end-to-end tests tests where feasible.
- [ ] All commits contain a well written commit description including a title,
Copy link
Member

Choose a reason for hiding this comment

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

plus commit log

Tetragon currently does not have a pull request template to provide contributors with directions on how to contribute to the project on Github.

This patch fixes this by adding:

1. pull_request_template.md file covering the important information contributors need to open request that checks that required criteria.

Fixes: cilium#1929

Signed-off by:  Paul Arah <paularah.self@gmail.com>
@lambdanis
Copy link
Contributor

Thanks for the update @paularah. The PR template looks good, now we need to clean up the git history. To keep the git history readable, we avoid merge commits and we squash changes requested in code review into existing commits. Here is how I would do it:

# Switch to main branch
git switch main
# Add cilium/tetragon repo as upstream
git remote add upstream git@github.com:cilium/tetragon.git
# Make your local main branch track main branch from upstream instead of your fork
git branch -u upstream/main
# Reset your local main branch to upstream main branch
git fetch upstream
git reset --hard upstream/main
# Switch to your branch
git switch pr/paularah/pr_template 
# Rebase with main branch
git rebase main
# Now the merge commit should be gone, check the git history. If it looks ok, reset last 2 commits.
git log
git reset HEAD~2
# Create a new commit (-s adds the sign-off line) and write a descriptive commit message
git add .
git commit -s
# Force push
git push -f

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add a PR template to this repo
3 participants