[fix][CI] Fix auto merge action#367
Merged
rahulait merged 7 commits intolinode:mainfrom Apr 2, 2025
Merged
Conversation
[CI] Added nightly merge workflow
[fix] Fixed branch names
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #367 +/- ##
=======================================
Coverage 72.98% 72.98%
=======================================
Files 14 14
Lines 2599 2599
=======================================
Hits 1897 1897
Misses 537 537
Partials 165 165 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
rahulait
approved these changes
Apr 2, 2025
hcwagner
pushed a commit
to hcwagner/linode-cloud-controller-manager
that referenced
this pull request
Jun 11, 2025
* Added nightly merge workflow * Fixed branch names * Change nightly merge to git script * Delete nightly merge and remove git fetch
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
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.
General:
Fixes the GHA to automatically merge
mainintogh-pageswhen a push is made tomain. This will keepgh-pagesand docs up to date.The nightly merge GHA doesn't seem to have a lot of debugging options available, and it fails with merge conflicts where manually performing the merge locally has no issues. This PR scraps the nightly merge workflow for a series of git commands to make the merge.
Pull Request Guidelines: