Closed praveenkumar closed 1 month ago
/cherry-pick release-4.18 /cherry-pick release-4.17 /cherry-pick release-4.16
@praveenkumar: once the present PR merges, I will cherry-pick it on top of release-4.18 in a new PR and assign it to you.
/cherry-pick release-4.17
@praveenkumar: once the present PR merges, I will cherry-pick it on top of release-4.17 in a new PR and assign it to you.
/cherry-pick release-4.16
@praveenkumar: once the present PR merges, I will cherry-pick it on top of release-4.16 in a new PR and assign it to you.
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: cfergeau
The full list of commands accepted by this bot can be found here.
The pull request process is described here
@praveenkumar: new pull request created: #963
@praveenkumar: #962 failed to apply on top of branch "release-4.17":
Applying: ci: update go version from 1.21 to 1.22
Using index info to reconstruct a base tree...
M ci_microshift.sh
Falling back to patching base and 3-way merge...
Auto-merging ci_microshift.sh
CONFLICT (content): Merge conflict in ci_microshift.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ci: update go version from 1.21 to 1.22
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".
@praveenkumar: #962 failed to apply on top of branch "release-4.16":
Applying: ci: update go version from 1.21 to 1.22
Using index info to reconstruct a base tree...
M ci.sh
M ci_microshift.sh
Falling back to patching base and 3-way merge...
Auto-merging ci_microshift.sh
CONFLICT (content): Merge conflict in ci_microshift.sh
Auto-merging ci.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ci: update go version from 1.21 to 1.22
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".
crc moved to use go-1.22 but here it is built using 1.21 and result to an error.