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.

Sign up for GitHub

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

Jump to bottom

Add cisagov's standard PR checklists to the Lineage templates #65

Merged
merged 7 commits into from
Mar 8, 2023
Merged

Add cisagov's standard PR checklists to the Lineage templates #65

merged 7 commits into from
Mar 8, 2023

Conversation

jsf9k
Copy link
Member

@jsf9k jsf9k commented Feb 15, 2023 •
edited

🗣 Description

This pull request adds the cisagov org's standard PR checklists to the Lineage templates.

💭 Motivation and context

This change was triggered by the realization that one will likely need to bump the version and create a release after merging a Lineage PR for any versioned repositories.

🧪 Testing

All automated tests pass.

✅ Pre-approval checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • All relevant type-of-change labels have been added.
  • I have read the CONTRIBUTING document.
  • These code changes follow cisagov code standards.
  • All new and existing tests pass.

✅ Pre-merge checklist

  • Finalize version.

✅ Post-merge checklist

  • Create a release.

@jsf9k
Add cisagov's standard PR checklists to the Lineage templates
1ad7b5c 
This was triggered by the realization that one will likely need to
bump the version and create a release after merging a Lineage PR for
any versioned repositories.
@jsf9k jsf9k added documentation This issue or pull request improves or adds to documentation improvement This issue or pull request will add or improve functionality, maintainability, or ease of use version bump This issue or pull request increments the version number labels Feb 15, 2023
@jsf9k jsf9k requested a review from a team February 15, 2023 20:05
@jsf9k jsf9k mentioned this pull request Feb 15, 2023
Merged
6 tasks
@jsf9k jsf9k self-assigned this Feb 15, 2023
dav3r
dav3r requested changes Feb 15, 2023
View reviewed changes
Copy link
Member

@dav3r dav3r left a comment

Choose a reason for hiding this comment

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

I've got some suggestions.

src/lineage/templates/conflict_template.md Outdated Show resolved Hide resolved
src/lineage/templates/clean_template.md Outdated Show resolved Hide resolved
src/lineage/templates/clean_template.md Outdated Show resolved Hide resolved
src/lineage/templates/clean_template.md Outdated Show resolved Hide resolved
src/lineage/templates/conflict_template.md Outdated Show resolved Hide resolved
src/lineage/templates/conflict_template.md Outdated Show resolved Hide resolved
src/lineage/templates/conflict_template.md Outdated Show resolved Hide resolved
jsf9k and others added 2 commits February 15, 2023 16:44
@jsf9k @dav3r
Elaborate on checkbox portion of instructions
4add5aa 
Co-authored-by: dav3r <david.redmin@trio.dhs.gov>
@jsf9k @dav3r
Move helper statements out of comments and into the light
8feb26b 
Co-authored-by: dav3r <david.redmin@trio.dhs.gov>
@jsf9k jsf9k requested a review from dav3r February 15, 2023 21:46
dav3r
dav3r approved these changes Feb 15, 2023
View reviewed changes
Copy link
Member

@dav3r dav3r left a comment

Choose a reason for hiding this comment

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

👍 ✅

@mcdonnnj
Copy link
Member

@jsf9k Would you consider this PR as resolving #61? If so we should link it to this PR.

@jsf9k jsf9k linked an issue Feb 17, 2023 that may be closed by this pull request
Consider integrating the standard cisagov PR template #61
Closed
@jsf9k
Copy link
Member Author

jsf9k commented Feb 17, 2023

@jsf9k Would you consider this PR as resolving #61? If so we should link it to this PR.

Done!

mcdonnnj
mcdonnnj requested changes Mar 8, 2023
View reviewed changes
src/lineage/templates/clean_template.md Outdated Show resolved Hide resolved
src/lineage/templates/conflict_template.md Outdated Show resolved Hide resolved
src/lineage/templates/clean_template.md Outdated Show resolved Hide resolved
src/lineage/templates/conflict_template.md Outdated Show resolved Hide resolved
jsf9k and others added 2 commits March 8, 2023 09:26
@jsf9k @mcdonnnj
Remove checklist items that do not apply to automatically generated PRs
8d6fa98 
Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>
@jsf9k @mcdonnnj
Clarify that a version bump should only be done when appropriate
3364e18 
Changes to internal dependencies that do not change the API (or the
build product) do not require and should not receive a version bump.

Co-authored-by: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>
@jsf9k jsf9k requested a review from mcdonnnj March 8, 2023 14:54
mcdonnnj
mcdonnnj approved these changes Mar 8, 2023
View reviewed changes
Copy link
Member

@mcdonnnj mcdonnnj left a comment

Choose a reason for hiding this comment

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

LGTM ✔

@jsf9k jsf9k merged commit 20696a4 into develop Mar 8, 2023
@jsf9k jsf9k deleted the improvement/mention-creating-a-release branch March 8, 2023 17:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dav3r dav3r dav3r approved these changes

@mcdonnnj mcdonnnj mcdonnnj approved these changes

@felddy felddy Awaiting requested review from felddy felddy is a code owner

Assignees

@jsf9k jsf9k

Labels
documentation This issue or pull request improves or adds to documentation improvement This issue or pull request will add or improve functionality, maintainability, or ease of use version bump This issue or pull request increments the version number
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Consider integrating the standard cisagov PR template
3 participants
@jsf9k @mcdonnnj @dav3r