Skip to content

doc: GitHub PRs workflow#8920

Closed
catenacyber wants to merge 1 commit into
OISF:masterfrom
catenacyber:doc-github-prs-v3
Closed

doc: GitHub PRs workflow#8920
catenacyber wants to merge 1 commit into
OISF:masterfrom
catenacyber:doc-github-prs-v3

Conversation

@catenacyber
Copy link
Copy Markdown
Contributor

Link to redmine ticket:
None

Describe changes:

  • adds a documentation about GitHub PRs workflow

Draft : to be discussed, and I guess after merge of #8898, test if filter for approved PRs works again

Modifies #8913 by putting this in the dev guide

@codecov
Copy link
Copy Markdown

codecov Bot commented May 25, 2023

Codecov Report

Merging #8920 (cd7dd81) into master (ebe0a7b) will increase coverage by 0.04%.
The diff coverage is n/a.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8920      +/-   ##
==========================================
+ Coverage   82.30%   82.34%   +0.04%     
==========================================
  Files         969      969              
  Lines      273335   273335              
==========================================
+ Hits       224961   225085     +124     
+ Misses      48374    48250     -124     
Flag Coverage Δ
fuzzcorpus 64.75% <ø> (+0.10%) ⬆️
suricata-verify 60.46% <ø> (+0.01%) ⬆️
unittests 62.95% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Copy link
Copy Markdown
Contributor

@jufajardini jufajardini left a comment

Choose a reason for hiding this comment

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

Looking good, wondering mostly about the timeframe for closing a PR with changes requested, based on the discussion the team last had.

Needs some formatting adjustments, I can work on that bit, but I'll point them out inline, too. :)

When someone gets assigned a PR, the PR should get a review status within 2 weeks : either changes requested, approved, or assigned to someone else if more expertise is needed.

GitHub filter for changes-requested PRs is `is:pr is:open draft:false sort:updated-asc review:changes-requested`
Such a PR may be closed if it has not been updated in the last month.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

As discussed with the team, isn't a month too short, considering some folks take long vacations?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Moving to 2 months

A PR should be marked as `draft` if it is not intended to be merged as is, but is waiting for some sort of feedback.
The author of the PR should explicit what kind of feedback is expected (CI/QA run, discussion on the code, etc...)

GitHub filter is `is:pr is:open draft:true sort:updated-asc`
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

requires `` to create inline code:

Suggested change
GitHub filter is `is:pr is:open draft:true sort:updated-asc`
GitHub filter is ``is:pr is:open draft:true sort:updated-asc``

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

ok

Comment on lines +18 to +20
1. get reviewed, and either request changes or get approved
2. if approved, get staged in a next branch (with other PRs), wait for CI validation (and eventually request changes if CI finds anything)
3. get merged and closed
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

These require indentation to be rendered as a list, with one item per line

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

So, adding a space at the beginning of each line, right ?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I usually add a couple, to be safe. Their documentation doesn't mention, this, to be honest, but at least locally I always need that to prevent them from being rendered as simple inline text.

https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html

Draft PRs
~~~~~~~~~

A PR should be marked as `draft` if it is not intended to be merged as is, but is waiting for some sort of feedback.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We are trying to enforce a character limit around 79/80 per line.

Mergeable PRs
~~~~~~~~~~~~~

When a Pull Request is intended to be merged as is, the workflow is the following :
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nit: space before the ":" :P

@catenacyber
Copy link
Copy Markdown
Contributor Author

Replaced by #8925

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants