-
Notifications
You must be signed in to change notification settings - Fork 79
fix: resolve dependabot auto-merge workflow issues #885
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
Open
MitaliBhalla
wants to merge
1
commit into
openshift:main
Choose a base branch
from
MitaliBhalla:fix-dependabot-workflow-2026
base: main
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.
+13
−17
Open
Changes from all commits
Commits
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,6 @@ permissions: | |
| contents: write | ||
| pull-requests: write | ||
| checks: read | ||
| metadata: read | ||
| actions: read | ||
|
|
||
| jobs: | ||
|
|
@@ -29,9 +28,11 @@ jobs: | |
| - name: Check PR Labels | ||
| id: check-labels | ||
| run: | | ||
| # Check if PR has the required labels for auto-merge | ||
| if [[ "${{ contains(github.event.pull_request.labels.*.name, 'area/dependency') }}" == "true" ]] && \ | ||
| [[ "${{ contains(github.event.pull_request.labels.*.name, 'ok-to-test') }}" == "true" ]]; then | ||
| # For Dependabot PRs, we'll be more permissive with labels | ||
| # Check if PR has dependency-related labels OR is from dependabot | ||
| if [[ "${{ contains(github.event.pull_request.labels.*.name, 'area/dependency') }}" == "true" ]] || \ | ||
| [[ "${{ contains(github.event.pull_request.labels.*.name, 'dependencies') }}" == "true" ]] || \ | ||
| [[ "${{ github.actor }}" == "dependabot[bot]" ]]; then | ||
| echo "has-required-labels=true" >> $GITHUB_OUTPUT | ||
| else | ||
| echo "has-required-labels=false" >> $GITHUB_OUTPUT | ||
|
|
@@ -55,8 +56,8 @@ jobs: | |
| -X PUT \ | ||
| -H "Accept: application/vnd.github+json" \ | ||
| -H "Authorization: Bearer $GH_TOKEN" \ | ||
| "https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/merge" \ | ||
| -d '{"merge_method":"merge"}') | ||
| "https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}" \ | ||
| -d '{"auto_merge":{"merge_method":"merge"}}') | ||
|
|
||
| if [[ "$response" -eq 200 ]]; then | ||
| echo "✅ Auto-merge enabled successfully" | ||
|
|
@@ -82,17 +83,12 @@ jobs: | |
| steps.check-labels.outputs.has-required-labels == 'true' && | ||
| steps.metadata.outputs.update-type == 'version-update:semver-major' | ||
| run: | | ||
| gh pr comment "${{ github.event.pull_request.number }}" --body \ | ||
| "🚨 **Major Version Update Detected** 🚨 | ||
|
|
||
| This PR contains a major version update that requires manual review: | ||
| - **Dependency:** ${{ steps.metadata.outputs.dependency-names }} | ||
| - **Previous version:** ${{ steps.metadata.outputs.previous-version }} | ||
| - **New version:** ${{ steps.metadata.outputs.new-version }} | ||
|
|
||
| Please review the changelog and breaking changes before merging. | ||
|
|
||
| Auto-merge has been **disabled** for this PR." | ||
| # Add a comment to the PR explaining major version update (token is automatically masked) | ||
| curl -s -X POST \ | ||
| -H "Accept: application/vnd.github+json" \ | ||
| -H "Authorization: Bearer $GH_TOKEN" \ | ||
| "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments" \ | ||
| -d '{"body":"🚨 **Major Version Update Detected** 🚨\n\nThis PR contains a major version update that requires manual review:\n- **Dependency:** ${{ steps.metadata.outputs.dependency-names }}\n- **Previous version:** ${{ steps.metadata.outputs.previous-version }}\n- **New version:** ${{ steps.metadata.outputs.new-version }}\n\nPlease review the changelog and breaking changes before merging.\n\nAuto-merge has been **disabled** for this PR."}' | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If dependency name contains |
||
| env: | ||
| GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Have you ever successfully used auto-merge for a PR before, but found it unstable or not working in certain scenarios?
Can see you use the GitHub REST API, I'm not sure whether auto-merge is actually supported. I found this discussion (https://github.com/orgs/community/discussions/24719
), and a recent reply in 2025 suggests it’s still unavailable?