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
[WINC-921]: Follow-up add fast-forward workflow #35987
[WINC-921]: Follow-up add fast-forward workflow #35987
Conversation
@alinaryan: no rehearsable tests are affected by this change |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the follow up, @alinaryan
git --no-pager log --pretty=oneline origin/"$DESTINATION_BRANCH"..HEAD | ||
if ! git push origin $DESTINATION_BRANCH; then | ||
echo "INFO Pushing to new branch $DESTINATION_BRANCH" | ||
if ! git push --set-upstream origin "$DESTINATION_BRANCH" ; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please mention why you are making this change in your commit message.
I also don't understand why you need the --set-upstream
. Why is that needed given it is an ephemeral config change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated the commit message and removed the --set-upstream
given what you said. I was able to run this locally with no errors.
This commit removes the 'git log' line in the case of fast-forwarding to a new branch since all the commits will be new to the branch. Follow-up to openshift#35781 Signed-off-by: Alina Ryan <aliryan@redhat.com>
901cf57
to
ac3ae65
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
/remove-lgtm |
This commit switches the image reference in the fast-forward workflow from 'cli' to 'tools' since the 'cli' image does not have git installed. Git is needed for the fast-forward workflow to be able to perform git commands. Signed-off-by: Alina Ryan <aliryan@redhat.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm |
1 similar comment
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: alinaryan, aravindhp, saifshaikh48, sebsoto 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 |
LGTM |
/hold cancel |
@alinaryan: all tests passed! Full PR test history. Your PR dashboard. 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/test-infra repository. I understand the commands that are listed here. |
Removes the 'git log' line and sets the upstream branch as origin in the case of fast-forwarding to a new branch.
Follow-up to #35781