-
Notifications
You must be signed in to change notification settings - Fork 0
fix(ci): admit stacked PR checks without bypassing docs contracts #1096
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
Draft
seonghobae
wants to merge
10
commits into
develop
Choose a base branch
from
chore/paths-ignore-fix
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
6437ba1
fix(ci): skip docs-only changes for Tests, OpenSSF Evidence Coverage,…
seonghobae 22c303e
fix(ci): ignore Markdown documentation at any depth
seonghobae 38e0537
test(ci): keep contract-sensitive docs under validation
seonghobae 6b66f93
fix(ci): keep documentation contracts in full tests
seonghobae 65af96e
fix(ci): keep OpenSSF document contracts covered
seonghobae d53f653
fix(ci): keep pinned-HTTPS document contracts covered
seonghobae a0072fb
fix(ci): keep retention document contracts covered
seonghobae e159c7b
fix(ci): keep scan-path document contracts covered
seonghobae f1172f0
test(ci): require checks on stacked pull requests
seonghobae cf5e355
fix(ci): admit stacked pull-request bases
seonghobae File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| """Contracts preventing CI admission gaps for documentation and stacked pull requests.""" | ||
|
|
||
| from pathlib import Path | ||
|
|
||
| import pytest | ||
|
|
||
|
|
||
| CONTRACT_SENSITIVE_WORKFLOWS = ( | ||
| ".github/workflows/tests.yml", | ||
| ".github/workflows/openssf-evidence-coverage.yml", | ||
| ".github/workflows/pinned-https-coverage.yml", | ||
| ".github/workflows/retention-audit-coverage.yml", | ||
| ".github/workflows/scan-path-context-coverage.yml", | ||
| ) | ||
|
|
||
| STACKED_PR_WORKFLOWS = ( | ||
| ".github/workflows/tests.yml", | ||
| ".github/workflows/security-process.yml", | ||
| ".github/workflows/openssf-evidence-coverage.yml", | ||
| ".github/workflows/pinned-https-coverage.yml", | ||
| ".github/workflows/retention-audit-coverage.yml", | ||
| ".github/workflows/scan-path-context-coverage.yml", | ||
| ".github/workflows/controlplane-schema-coverage.yml", | ||
| ".github/workflows/commercial-readiness-agent-coverage.yml", | ||
| ) | ||
|
|
||
|
|
||
| def _event_block(workflow: str, event: str) -> str: | ||
| """Return one peer event block from the workflow's top-level ``on`` mapping.""" | ||
| lines = workflow.splitlines() | ||
| marker = f" {event}:" | ||
| try: | ||
| start = lines.index(marker) | ||
| except ValueError as exc: | ||
| raise AssertionError(f"missing workflow event: {event}") from exc | ||
|
|
||
| block: list[str] = [] | ||
| for line in lines[start + 1 :]: | ||
| if line.startswith(" ") and not line.startswith(" "): | ||
| break | ||
| block.append(line) | ||
| return "\n".join(block) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize("workflow_path", CONTRACT_SENSITIVE_WORKFLOWS) | ||
| def test_contract_sensitive_workflows_do_not_skip_documentation( | ||
| workflow_path: str, | ||
| ) -> None: | ||
| """Docs and policy Markdown remain covered until a dedicated contract lane exists.""" | ||
| workflow = Path(workflow_path).read_text(encoding="utf-8") | ||
|
|
||
| for event in ("push", "pull_request"): | ||
| assert "paths-ignore:" not in _event_block(workflow, event) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize("workflow_path", STACKED_PR_WORKFLOWS) | ||
| def test_pull_request_checks_admit_stacked_bases(workflow_path: str) -> None: | ||
| """PR checks must materialize when a reviewable stack targets another feature branch.""" | ||
| workflow = Path(workflow_path).read_text(encoding="utf-8") | ||
|
|
||
| assert "branches:" not in _event_block(workflow, "pull_request") | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.