Skip to content
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

chore: merge adoptor and crl chart changes #2027

Merged
merged 4 commits into from
Jan 13, 2025

Conversation

junczhu
Copy link
Collaborator

@junczhu junczhu commented Jan 13, 2025

Description

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, using fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when the PR gets merged):

Prepare release branch.

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Helm Chart Change (any edit/addition/update that is necessary for changes merged to the main branch)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Please also list any relevant details for your test configuration

  • Test A
  • Test B

Checklist:

  • Does the affected code have corresponding tests?
  • Are the changes documented, not just with inline documentation, but also with conceptual documentation such as an overview of a new feature, or task-based documentation like a tutorial? Consider if this change should be announced on your project blog.
  • Does this introduce breaking changes that would require an announcement or bumping the major version?
  • Do all new files have appropriate license header?

Post Merge Requirements

  • MAINTAINERS: manually trigger the "Publish Package" workflow after merging any PR that indicates Helm Chart Change

junczhu and others added 4 commits January 13, 2025 03:03
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
chore: automated PR to main 2025-01-13
@binbin-li
Copy link
Collaborator

since we already bump up the chart/app version, I think we can just recreate the v1.4 branch with all latest changes and bump up to the same version as the previous one.

@susanshi susanshi changed the title chore: merge new changes chore: merge adoptor and crl chart changes Jan 13, 2025
Copy link
Collaborator

@susanshi susanshi left a comment

Choose a reason for hiding this comment

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

LGTM

@junczhu junczhu merged commit 32cc3cc into ratify-project:release-1.4 Jan 13, 2025
39 of 49 checks passed
@junczhu
Copy link
Collaborator Author

junczhu commented Jan 13, 2025

since we already bump up the chart/app version, I think we can just recreate the v1.4 branch with all latest changes and bump up to the same version as the previous one.

Re-create a new branch based on main would loss the chart changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants