Skip to content

GHA: Fix permissions for merge-conflict-checker#12830

Closed
vishesh92 wants to merge 1 commit intoapache:4.20from
shapeblue:fixup-merge-conflict-checker
Closed

GHA: Fix permissions for merge-conflict-checker#12830
vishesh92 wants to merge 1 commit intoapache:4.20from
shapeblue:fixup-merge-conflict-checker

Conversation

@vishesh92
Copy link
Member

@vishesh92 vishesh92 commented Mar 17, 2026

Description

This PR fixes the failure of merge-conflict-checker.yml by making a small change to the workflow permissions in .github/workflows/merge-conflict-checker.yml, granting the workflow write access to pull requests.

Some failing runs:
https://github.com/apache/cloudstack/actions/runs/23049303719
https://github.com/apache/cloudstack/actions/runs/23143958894
https://github.com/apache/cloudstack/actions/runs/23147814894

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • Build/CI
  • Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Updates the GitHub Actions workflow for the merge conflict checker to address permission-related failures when interacting with pull requests.

Changes:

  • Grants pull-requests: write permission at the workflow level in merge-conflict-checker.yml.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.


permissions: # added using https://github.com/step-security/secure-workflows
contents: read
pull-requests: write
@codecov
Copy link

codecov bot commented Mar 17, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 16.25%. Comparing base (61afb4c) to head (c5bda29).

Additional details and impacted files
@@            Coverage Diff            @@
##               4.20   #12830   +/-   ##
=========================================
  Coverage     16.24%   16.25%           
- Complexity    13411    13413    +2     
=========================================
  Files          5664     5664           
  Lines        500463   500463           
  Branches      60779    60779           
=========================================
+ Hits          81308    81334   +26     
+ Misses       410059   410035   -24     
+ Partials       9096     9094    -2     
Flag Coverage Δ
uitests 4.15% <ø> (ø)
unittests 17.10% <ø> (+<0.01%) ⬆️

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@vishesh92 vishesh92 closed this Mar 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants