ci: fix merge commit validation and document release environment setup - #2220
Merged
Conversation
#2218) * ci: fix merge commit validation and document release environment setup This commit addresses two maintenance branch release process issues: 1. The commit type validation step now excludes merge commits by adding `--no-merges` to the git log command. GitHub's auto-generated merge commit messages (e.g. "Merge pull request #NNN") don't follow conventional commit format, but semantic-release already ignores them (default_bump_level = 0), so validating them is unnecessary and causes false failures. 2. Expanded documentation in github_actions_setup.md with explicit step-by-step instructions for adding maintenance branches to the release environment, emphasizing individual branch names over wildcards to require deliberate opt-in. Updated maintenance_releases.md to cross-reference the detailed instructions. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> Signed-off-by: Chris Butler <chris.butler@redhat.com> * ci: add Snyk exception for paramiko cryptographic algorithm issue Add exception for SNYK-PYTHON-PARAMIKO-16425764, a low severity cryptographic algorithm vulnerability in paramiko@4.0.0. No upgrade or patch is currently available. Paramiko is used for remote SSH operations which are not part of trestle's primary use case. The exception expires in 3 months to prompt re-evaluation when upstream fixes become available. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> Signed-off-by: Chris Butler <chris.butler@redhat.com> --------- Signed-off-by: Chris Butler <chris.butler@redhat.com> Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
Cherry-pick of #2218 from
developto thev3maintenance branch.This PR addresses two maintenance branch release process issues discovered during v3 branch CI failures:
Fixes merge commit validation failure: The "Validate commit types on maintenance branch" step now excludes merge commits by adding
--no-mergesto thegit logcommand. GitHub's auto-generated merge commit messages (e.g.,Merge pull request #2217 from ...) don't follow conventional commit format, but semantic-release already ignores them (default_bump_level = 0), so the validation was unnecessarily strict and caused false failures.Documents release environment setup: Expanded
docs/contributing/github_actions_setup.mdwith explicit step-by-step instructions (both UI and CLI) for adding maintenance branches to thereleaseenvironment. Emphasizes adding each branch individually (e.g.,v3,v4) rather than using wildcards, to require deliberate opt-in for new maintenance branches. Updateddocs/contributing/maintenance_releases.mdto cross-reference the detailed instructions.Adds Snyk exception: Includes exception for
SNYK-PYTHON-PARAMIKO-16425764, a low severity cryptographic algorithm vulnerability in paramiko@4.0.0 with no available upgrade or patch.Changes
.github/workflows/python-push.yml: Added--no-mergesflag to git log in commit type validation stepdocs/contributing/github_actions_setup.md: New section with detailed release environment configuration instructionsdocs/contributing/maintenance_releases.md: Updated step 4 to reference the expanded instructions.snyk: Added exception for paramiko vulnerabilityVerification
Related Issues
Resolves the CI failure observed in https://github.com/oscal-compass/compliance-trestle/actions/runs/25378701232/job/74753750952
🤖 Generated with Claude Code