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

Extract fbc sources code to separate repository #395

Merged
merged 1 commit into from
May 30, 2024

Conversation

osmman
Copy link
Contributor

@osmman osmman commented May 30, 2024

No description provided.

@openshift-ci openshift-ci bot requested review from JasonPowr and lkatalin May 30, 2024 09:13
Copy link

openshift-ci bot commented May 30, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: osmman

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@JasonPowr
Copy link
Contributor

/lgtm

This can also be cherry-picked to release-1-0

@JasonPowr
Copy link
Contributor

/cherrypick release-1.0

@openshift-cherrypick-robot

@JasonPowr: once the present PR merges, I will cherry-pick it on top of release-1.0 in a new PR and assign it to you.

In response to this:

/cherrypick release-1.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-merge-bot openshift-merge-bot bot merged commit 23d8e43 into main May 30, 2024
9 checks passed
@openshift-cherrypick-robot

@JasonPowr: #395 failed to apply on top of branch "release-1.0":

Applying: Extract fbc sources code to separate repository
Using index info to reconstruct a base tree...
M	.github/workflows/upgrade.yml
M	.tekton/fbc-v4-13-pull-request.yaml
M	.tekton/fbc-v4-13-push.yaml
M	.tekton/fbc-v4-14-pull-request.yaml
M	.tekton/fbc-v4-14-push.yaml
M	.tekton/fbc-v4-15-pull-request.yaml
M	.tekton/fbc-v4-15-push.yaml
M	fbc/v4.13/catalog/rhtas-operator/catalog.json
M	fbc/v4.13/graph.yaml
M	fbc/v4.14/catalog/rhtas-operator/catalog.json
M	fbc/v4.14/graph.yaml
M	fbc/v4.15/catalog/rhtas-operator/catalog.json
M	fbc/v4.15/graph.yaml
Falling back to patching base and 3-way merge...
Removing fbc/v4.15/v4.15/.empty
Removing fbc/v4.15/licenses/license.txt
CONFLICT (modify/delete): fbc/v4.15/graph.yaml deleted in Extract fbc sources code to separate repository and modified in HEAD. Version HEAD of fbc/v4.15/graph.yaml left in tree.
Removing fbc/v4.15/devfile.yaml
Removing fbc/v4.15/ci
CONFLICT (modify/delete): fbc/v4.15/catalog/rhtas-operator/catalog.json deleted in Extract fbc sources code to separate repository and modified in HEAD. Version HEAD of fbc/v4.15/catalog/rhtas-operator/catalog.json left in tree.
Removing fbc/v4.15/catalog.Dockerfile
Removing fbc/v4.14/v4.14/.empty
Removing fbc/v4.14/licenses/license.txt
CONFLICT (modify/delete): fbc/v4.14/graph.yaml deleted in Extract fbc sources code to separate repository and modified in HEAD. Version HEAD of fbc/v4.14/graph.yaml left in tree.
Removing fbc/v4.14/devfile.yaml
CONFLICT (modify/delete): fbc/v4.14/catalog/rhtas-operator/catalog.json deleted in Extract fbc sources code to separate repository and modified in HEAD. Version HEAD of fbc/v4.14/catalog/rhtas-operator/catalog.json left in tree.
Removing fbc/v4.14/catalog.Dockerfile
Removing fbc/v4.13/v4.13/.empty
Removing fbc/v4.13/licenses/license.txt
CONFLICT (modify/delete): fbc/v4.13/graph.yaml deleted in Extract fbc sources code to separate repository and modified in HEAD. Version HEAD of fbc/v4.13/graph.yaml left in tree.
Removing fbc/v4.13/devfile.yaml
CONFLICT (modify/delete): fbc/v4.13/catalog/rhtas-operator/catalog.json deleted in Extract fbc sources code to separate repository and modified in HEAD. Version HEAD of fbc/v4.13/catalog/rhtas-operator/catalog.json left in tree.
Removing fbc/v4.13/catalog.Dockerfile
Removing fbc/generate-fbc.sh
Removing fbc/fbc-preflight-testing-steps
CONFLICT (modify/delete): .tekton/fbc-v4-15-push.yaml deleted in Extract fbc sources code to separate repository and modified in HEAD. Version HEAD of .tekton/fbc-v4-15-push.yaml left in tree.
CONFLICT (modify/delete): .tekton/fbc-v4-15-pull-request.yaml deleted in Extract fbc sources code to separate repository and modified in HEAD. Version HEAD of .tekton/fbc-v4-15-pull-request.yaml left in tree.
CONFLICT (modify/delete): .tekton/fbc-v4-14-push.yaml deleted in Extract fbc sources code to separate repository and modified in HEAD. Version HEAD of .tekton/fbc-v4-14-push.yaml left in tree.
CONFLICT (modify/delete): .tekton/fbc-v4-14-pull-request.yaml deleted in Extract fbc sources code to separate repository and modified in HEAD. Version HEAD of .tekton/fbc-v4-14-pull-request.yaml left in tree.
CONFLICT (modify/delete): .tekton/fbc-v4-13-push.yaml deleted in Extract fbc sources code to separate repository and modified in HEAD. Version HEAD of .tekton/fbc-v4-13-push.yaml left in tree.
CONFLICT (modify/delete): .tekton/fbc-v4-13-pull-request.yaml deleted in Extract fbc sources code to separate repository and modified in HEAD. Version HEAD of .tekton/fbc-v4-13-pull-request.yaml left in tree.
Auto-merging .github/workflows/upgrade.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Extract fbc sources code to separate repository
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

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

Successfully merging this pull request may close these issues.

None yet

3 participants