Skip to content

[fix][CI] Fix auto merge action#367

Merged
rahulait merged 7 commits intolinode:mainfrom
Andrews2024:main
Apr 2, 2025
Merged

[fix][CI] Fix auto merge action#367
rahulait merged 7 commits intolinode:mainfrom
Andrews2024:main

Conversation

@Andrews2024
Copy link
Copy Markdown
Contributor

General:

Fixes the GHA to automatically merge main into gh-pages when a push is made to main. This will keep gh-pages and 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:

  1. Does your submission pass tests?
  2. Are you addressing a single feature in this PR?
  3. Are your commits atomic, addressing one change per commit?
  4. Are you following the conventions of the language?
  5. Have you saved your large formatting changes for a different PR, so we can focus on your work?
  6. Have you explained your rationale for why this feature is needed?

@github-actions github-actions Bot added bugfix for any bug fixes in the changelog. repo-ci-improvement for improvements in the repository or CI workflow in the changelog. labels Apr 1, 2025
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 1, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.98%. Comparing base (deb8ce8) to head (37e018f).
Report is 1 commits behind head on main.

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.
📢 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.

@rahulait rahulait merged commit 717a8f3 into linode:main Apr 2, 2025
9 checks passed
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugfix for any bug fixes in the changelog. repo-ci-improvement for improvements in the repository or CI workflow in the changelog.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants