Repository navigation
Automated Sync from main to stable - #64
Open
rhods-devops-app[bot] wants to merge 10 commits into
Open
rhods-devops-app[bot] wants to merge 10 commits into
rhods-devops-app[bot] wants to merge 10 commits into
Conversation
<!-- template-set:cleanup-odh-tenant --> Validated-Publication-Base: 5d956c2 Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
… tag to v1.26.10-1794208260 (#61) Signed-off-by: konflux-internal-p02 <170854209+konflux-internal-p02[bot]@users.noreply.github.com> Co-authored-by: konflux-internal-p02[bot] <170854209+konflux-internal-p02[bot]@users.noreply.github.com>
…hell#133) * chore: follow upstream with bump branches instead of `next` Since the move to the ai-openshell org, the `next` machinery no longer works: nobody is an admin, main's ruleset resets approval on every push (and `next` was force-pushed hourly), and the enterprise refuses the long-lived UPSTREAM_BOT_TOKEN. - Follow upstream runs once a day. For a new stable OpenShell release it creates bump/openshell-X.Y.Z from main with one signed-off pin-move commit, starts CI on it with workflow_dispatch (a PR opened with the default token starts none) and opens a PR into main. It makes a bump branch once and never rebases, moves or force-pushes it. - A person can run it with a `version` to make a prep branch for a pre-release. Check A still runs nightly against upstream's newest pre-release and keeps the compat-migrate issue, which now says how to start a prep branch. - publish.yml is manual only: no release after a merge, and next-merge.mjs is gone. Release branches are made by hand. - ci.yml no longer runs for `next`, can be started by hand (publishing nothing), and `pins a stable release` applies to every PR. - The pin move accepts the SDK's own tag (upstream tags sdk/go/v0.1.7), checked with `go list -m -json` to be the release commit. Found by a dry run against 0.1.7, which every bump from now on would have hit. - Only the default token is used; UPSTREAM_BOT_TOKEN and UPSTREAM_AUTOMERGE can be deleted. - ADR 0005 gets a dated amendment; the upstream README, releasing, contributing, rules and skills docs follow. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Gage Krumbach <gkrumbac@redhat.com> * chore: open bumps with the bump-bot App, and pin the workflow's actions Simon (infra) keeps "Allow GitHub Actions to create and approve pull requests" off org-wide, and a pull request opened with the default token runs no CI. So the bump job now takes a token from the organization's bump-bot GitHub App, the same setup as sdk-go: - The job runs in the `bump-bot` environment, which only main can deploy to, and gets its token with actions/create-github-app-token from BUMP_BOT_CLIENT_ID and BUMP_BOT_PRIVATE_KEY, asked for with contents and pull requests write only. Its own GITHUB_TOKEN is read-only. - The App token reaches only the steps that list pull requests and publish, as the default token did. - No more starting CI by hand: ci.yml drops workflow_dispatch and the check-* changes that went with it, and publish.py drops the dispatch. - Every action in follow-upstream.yml is pinned by commit SHA; a test holds it to that. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Gage Krumbach <gkrumbac@redhat.com> * fix: preview bumps from any ref, and never publish one main caught up with Two points from Dan's review of ai-openshell#133: - A dry run off main could not preview the bump: the one bump job needed the bump-bot environment, which only main may use. It is now two jobs. `bump` makes the commit with no secret and no environment (read-only token, pull-requests: read to list the branch's pull requests), so it runs from any ref, and hands the commit on as a git bundle. `publish-bump` runs only on main and never in a dry run, in the bump-bot environment, and builds and downloads nothing. - The commit was made from main as the run found it, so a pin that moved on main during the run could still be published backward. publish-bump now checks main out as it is, and `follow.py check-forward` refuses the bump unless its target is still ahead of main's pin. The App token is made only after that check. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Gage Krumbach <gkrumbac@redhat.com> --------- Signed-off-by: Gage Krumbach <gkrumbac@redhat.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
|
Important Review skippedBot user detected. To trigger a single review, invoke the
|
…r tag to v9.8-1794186349 (#62) Signed-off-by: konflux-internal-p02 <170854209+konflux-internal-p02[bot]@users.noreply.github.com> Co-authored-by: konflux-internal-p02[bot] <170854209+konflux-internal-p02[bot]@users.noreply.github.com>
… tag to v1.27.3-1793884566 (#67) Signed-off-by: rhods-devops-app[bot] <131765678+rhods-devops-app[bot]@users.noreply.github.com> Co-authored-by: rhods-devops-app[bot] <131765678+rhods-devops-app[bot]@users.noreply.github.com>
… tag to v1.27.3-1794518352 (#79) Signed-off-by: konflux-internal-p02 <170854209+konflux-internal-p02[bot]@users.noreply.github.com> Co-authored-by: konflux-internal-p02[bot] <170854209+konflux-internal-p02[bot]@users.noreply.github.com>
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.
Automated Sync from main to stable
This PR automatically syncs the
mainbranch to thestablebranch by opening a pull request frommainintostable.Sync Summary
Latest commit:
34c8a0esync pipelineruns with konflux-central - dc5380eTotal commits to sync: 10
Source:
https://github.com/red-hat-data-services/openshell-dashboard.git@mainTarget:
https://github.com/red-hat-data-services/openshell-dashboard.git@stablePR head:
mainCommits to be synced
34c8a0esync pipelineruns with konflux-central - dc5380e59845a6chore(deps): update registry.access.redhat.com/ubi9/go-toolset docker tag to v1.27.3-1794518352 (chore(deps): update registry.access.redhat.com/ubi9/go-toolset docker tag to v1.27.3-1794518352 #79)0575142chore(deps): update registry.access.redhat.com/ubi9/go-toolset docker tag to v1.27.3-1793884566 (chore(deps): update registry.access.redhat.com/ubi9/go-toolset docker tag to v1.27.3-1793884566 (main) #67)43ac6edsync pipelineruns with konflux-central - dc20ab46689263Merge remote-tracking branch 'upstream/main'bca0fb7chore(deps): update registry.access.redhat.com/ubi9/ubi-minimal docker tag to v9.8-1794186349 (chore(deps): update registry.access.redhat.com/ubi9/ubi-minimal docker tag to v9.8-1794186349 #62)435331cMerge remote-tracking branch 'upstream/main'227035achore: follow upstream with bump branches instead ofnext(chore: follow upstream with bump branches instead ofnextai-openshell/console#133)2b5be73chore(deps): update registry.access.redhat.com/ubi9/go-toolset docker tag to v1.26.10-1794208260 (chore(deps): update registry.access.redhat.com/ubi9/go-toolset docker tag to v1.26.10-1794208260 #61)b69b88achore: reconcile component repo PipelineRuns on main (chore: reconcile component repo PipelineRuns on main #59)Merging
GitHub automerge is enabled for this pull request once required checks pass.