Skip to content

Conversation

adambkaplan
Copy link
Member

Changes

Updating the contribution guide address a few process changes that were introduced in 2024:

  • The "community" repo should be used as a fallback repository for bug reports or feature requests.
  • Make explicit that code changes should merge to the main branch first. We have always used the trunk-based approach for development - it wasn't until SHIP-0038 was adopted that we actually had release branches to maintain [1].
  • Provide specific instructions on how to add the DCO sign-off footer to commit messages.
  • Add link on how to submit a pull request on GitHub. This may not be intuitive, especially for non-technical contributors.

[1] https://github.com/shipwright-io/community/blob/main/ships/0038-release-branching-backports.md

/kind documentation

Submitter Checklist

  • Includes tests if functionality changed/was added
  • Includes docs if changes are user-facing
  • Set a kind label on this PR
  • Release notes block has been filled in, or marked NONE

See the contributor guide
for details on coding conventions, github and prow interactions, and the code review process.

Release Notes

Contribution guide updated to clarify process for submitting code changes through GitHub.

@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 9, 2025
@openshift-ci openshift-ci bot added the kind/documentation Categorizes issue or PR as related to documentation. label Apr 9, 2025
Updating the contribution guide address a few process changes that were
introduced in 2024:

- The "community" repo should be used as a fallback repository for bug
  reports or feature requests.
- Make explicit that code changes should merge to the `main` branch
  first. We have always used the trunk-based approach for development -
  it wasn't until SHIP-0038 was adopted that we actually had release
  branches to maintain [1].
- Provide specific instructions on how to add the DCO sign-off footer
  to commit messages.
- Add link on how to submit a pull request on GitHub. This may not be
  intuitive, especially for non-technical contributors.

[1] https://github.com/shipwright-io/community/blob/main/ships/0038-release-branching-backports.md

Signed-off-by: Adam Kaplan <[email protected]>
@adambkaplan
Copy link
Member Author

cc @qu1queee @SaschaSchwarze0 - a new contributor asked me which branch code changes to merge to, since we now have release branches in our main repos.

Copy link
Member

@SaschaSchwarze0 SaschaSchwarze0 left a comment

Choose a reason for hiding this comment

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

Thanks.

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 9, 2025
@SaschaSchwarze0 SaschaSchwarze0 merged commit e7afb3b into shipwright-io:main Apr 9, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/documentation Categorizes issue or PR as related to documentation. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

2 participants