feat: replace olm-catalog branch with PR-based catalog workflow#3
Merged
Conversation
Previously the OLM catalog index (olm/index-template.yaml) was stored on a separate long-lived olm-catalog branch and updated by committing directly to it on every CI run. This change replaces that pattern with a PR-based approach: - olm/ is moved into main (and release-* branches) as a regular tracked directory - The olm-publish action no longer performs any git operations; it only builds and pushes images, leaving olm/index-template.yaml modified in the working tree - Each release workflow opens (or force-updates) a PR with the catalog changes for human review before they land Channel/trigger/branch mapping: development push to main -> PR to main candidate chore(release): on release-* -> PR to release-X.Y stable GitHub release promoted -> PR to release-X.Y New release-branch.yaml handles RC releases (prerelease creation, OLM candidate publish, catalog PR) cut from release-* branches. Also updates docs/developer.md and docs/design/release.md to reflect the new release process. Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
jan--f
force-pushed
the
feat/pr-based-olm-catalog
branch
from
32add3d to
e167522
Compare
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
1 participant
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.
Previously the OLM catalog index (olm/index-template.yaml) was stored on a separate long-lived olm-catalog branch and updated by committing directly to it on every CI run.
This change replaces that pattern with a PR-based approach:
Channel/trigger/branch mapping:
development push to main -> PR to main
candidate chore(release): on release-* -> PR to release-X.Y
stable GitHub release promoted -> PR to release-X.Y
New release-branch.yaml handles RC releases (prerelease creation, OLM candidate publish, catalog PR) cut from release-* branches.
Also updates docs/developer.md and docs/design/release.md to reflect the new release process.