chore(merge-*): restore downstream files and drop upstream .github/workflows post-merge - #163
Merged
Merged
Conversation
machine424
changed the title
machine424
changed the title
… .ci-operator.yaml Add these to restore-downstream for all non-ACM merge workflows so downstream-specific files are preserved on merge conflicts. Also remove .github/ and .github/workflows/ from restore-upstream where they were (kube-state-metrics, resource-state-metrics, node-exporter) since upstream .github/ is not needed downstream. Fixes alertmanager merger broken by a conflict in .github/workflows/build-release-branch.yml. Ref: https://github.com/rhobs/syncbot/actions/runs/32792840276
…onfig post-merge Upstream CI workflows and dependabot.yml are unused downstream and can trigger unwanted security/dependabot alerts. Delete them post-merge instead of restoring them via restore-downstream.
machine424
changed the title
redhat-chai-bot
added a commit
to redhat-chai-bot/openshift_prometheus-alertmanager
that referenced
this pull request
Sep 1, 2026
The upstream GitHub Actions workflows are not used downstream (OpenShift CI uses Prow/ci-operator). The syncbot is being updated (rhobs/syncbot#163) to drop .github/workflows post-merge, so removing it now avoids merge conflicts.
slashpai
reviewed
Sep 3, 2026
| restore-downstream: OWNERS | ||
| restore-downstream: >- | ||
| .ci-operator.yaml | ||
| Dockerfile.ocp |
Member
There was a problem hiding this comment.
These two exists only downstream, it wont cause merge conflict IIUC. Any reason you think it should be here?
Contributor
Author
There was a problem hiding this comment.
Just to be safe, no matter what happens, we want those downstream files there.
simonpasquier
approved these changes
Sep 3, 2026
This was referenced Sep 3, 2026
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
3 participants
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.
Add
.ci-operator.yaml,Dockerfile.ocpandOWNERStorestore-downstreamfor all non-ACM merge workflows so downstream-specific files are preserved on merge conflicts.Remove
.github/and.github/workflows/fromrestore-upstreamwhere they were (kube-state-metrics, resource-state-metrics, node-exporter).Delete upstream CI workflows and
dependabot.ymlpost-merge (inmerge-flow.yaml) as they are unused downstream and trigger unwanted security/dependabot alerts.Fixes alertmanager merger broken by a conflict in
.github/workflows/build-release-branch.yml.Ref: https://github.com/rhobs/syncbot/actions/runs/32792840276